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

Fix a bug in FriendsModule.StatusNotify() where all subsequent friends would not be notified once a non-local friend was found.

0.7.3-extended
Justin Clark-Casey (justincc) 2012-05-07 17:21:45 +01:00
parent aba803c447
commit 84dfffe0aa
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -498,7 +498,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
Util.FireAndForget( Util.FireAndForget(
delegate delegate
{ {
m_log.DebugFormat("[FRIENDS MODULE]: Notifying {0} friends", friendList.Count); m_log.DebugFormat(
"[FRIENDS MODULE]: Notifying {0} friends of {1} of online status {2}",
friendList.Count, agentID, online);
// Notify about this user status // Notify about this user status
StatusNotify(friendList, agentID, online); StatusNotify(friendList, agentID, online);
} }
@ -515,7 +518,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
{ {
// Try local // Try local
if (LocalStatusNotification(userID, friendID, online)) if (LocalStatusNotification(userID, friendID, online))
return; continue;
// The friend is not here [as root]. Let's forward. // The friend is not here [as root]. Let's forward.
PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { friendID.ToString() }); PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { friendID.ToString() });
@ -523,11 +526,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
{ {
PresenceInfo friendSession = null; PresenceInfo friendSession = null;
foreach (PresenceInfo pinfo in friendSessions) foreach (PresenceInfo pinfo in friendSessions)
{
if (pinfo.RegionID != UUID.Zero) // let's guard against sessions-gone-bad if (pinfo.RegionID != UUID.Zero) // let's guard against sessions-gone-bad
{ {
friendSession = pinfo; friendSession = pinfo;
break; break;
} }
}
if (friendSession != null) if (friendSession != null)
{ {