OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Friends online notifications upon friendship now working (same sim only).

slimupdates
Diva Canto 2010-02-27 10:24:55 -08:00
parent a4472ceeac
commit 3906a14857
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
View File

@ -432,6 +432,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
GridInstantMessage im = new GridInstantMessage(client.Scene, client.AgentId, client.Name, friendID, GridInstantMessage im = new GridInstantMessage(client.Scene, client.AgentId, client.Name, friendID,
(byte)OpenMetaverse.InstantMessageDialog.FriendshipAccepted, client.AgentId.ToString(), false, Vector3.Zero); (byte)OpenMetaverse.InstantMessageDialog.FriendshipAccepted, client.AgentId.ToString(), false, Vector3.Zero);
friendClient.SendInstantMessage(im); friendClient.SendInstantMessage(im);
client.SendAgentOnline(new UUID[] { friendID });
// we're done // we're done
return; return;
} }
@ -442,7 +443,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
{ {
GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID); GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
m_FriendsSimConnector.FriendshipApproved(region, agentID, friendID); m_FriendsSimConnector.FriendshipApproved(region, agentID, friendID);
client.SendAgentOnline(new UUID[] { friendID });
} }
} }
private void OnDenyFriendRequest(IClientAPI client, UUID agentID, UUID friendID, List<UUID> callingCardFolders) private void OnDenyFriendRequest(IClientAPI client, UUID agentID, UUID friendID, List<UUID> callingCardFolders)

16
OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
View File

@ -123,6 +123,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
return; return;
IClientAPI client = (IClientAPI)sender; IClientAPI client = (IClientAPI)sender;
m_log.DebugFormat("[PRESENCE MODULE]: OnlineNotification requested by {0}", client.Name);
PresenceInfo[] status = PresenceService.GetAgents(args.ToArray()); PresenceInfo[] status = PresenceService.GetAgents(args.ToArray());
@ -131,10 +132,21 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
foreach (PresenceInfo pi in status) foreach (PresenceInfo pi in status)
{ {
UUID uuid = new UUID(pi.UserID);
if (pi.Online) if (pi.Online)
online.Add(new UUID(pi.UserID)); {
if (!online.Contains(uuid))
{
online.Add(uuid);
if (offline.Contains(uuid))
offline.Remove(uuid);
}
}
else else
offline.Add(new UUID(pi.UserID)); {
if (!online.Contains(uuid) && !offline.Contains(uuid))
offline.Add(uuid);
}
} }
if (online.Count > 0) if (online.Count > 0)