diff options
author | UbitUmarov | 2017-05-11 19:06:49 +0100 |
---|---|---|
committer | UbitUmarov | 2017-05-11 19:06:49 +0100 |
commit | fb427daa3443794b38c3dd3e5b58610971b35b13 (patch) | |
tree | c3a885068b5afe8395076a8791313878e6ad1a0f /OpenSim/Region/CoreModules/Avatar | |
parent | do not allow multiple logins of same avatar. No HG case, that needs work on ... (diff) | |
download | opensim-SC_OLD-fb427daa3443794b38c3dd3e5b58610971b35b13.zip opensim-SC_OLD-fb427daa3443794b38c3dd3e5b58610971b35b13.tar.gz opensim-SC_OLD-fb427daa3443794b38c3dd3e5b58610971b35b13.tar.bz2 opensim-SC_OLD-fb427daa3443794b38c3dd3e5b58610971b35b13.tar.xz |
avoid a null ref
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 35b48d9..91f19e3 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -512,18 +512,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
512 | if (((fi.MyFlags & (int)FriendRights.CanSeeOnline) != 0) && (fi.TheirFlags != -1)) | 512 | if (((fi.MyFlags & (int)FriendRights.CanSeeOnline) != 0) && (fi.TheirFlags != -1)) |
513 | friendList.Add(fi); | 513 | friendList.Add(fi); |
514 | } | 514 | } |
515 | 515 | if(friendList.Count > 0) | |
516 | Util.FireAndForget( | 516 | { |
517 | delegate | 517 | Util.FireAndForget( |
518 | { | 518 | delegate |
519 | // m_log.DebugFormat( | 519 | { |
520 | // "[FRIENDS MODULE]: Notifying {0} friends of {1} of online status {2}", | 520 | // m_log.DebugFormat( |
521 | // friendList.Count, agentID, online); | 521 | // "[FRIENDS MODULE]: Notifying {0} friends of {1} of online status {2}", |
522 | 522 | // friendList.Count, agentID, online); | |
523 | // Notify about this user status | 523 | |
524 | StatusNotify(friendList, agentID, online); | 524 | // Notify about this user status |
525 | }, null, "FriendsModule.StatusChange" | 525 | StatusNotify(friendList, agentID, online); |
526 | ); | 526 | }, null, "FriendsModule.StatusChange" |
527 | ); | ||
528 | } | ||
527 | } | 529 | } |
528 | } | 530 | } |
529 | 531 | ||
@@ -552,6 +554,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
552 | // We do this regrouping so that we can efficiently send a single request rather than one for each | 554 | // We do this regrouping so that we can efficiently send a single request rather than one for each |
553 | // friend in what may be a very large friends list. | 555 | // friend in what may be a very large friends list. |
554 | PresenceInfo[] friendSessions = PresenceService.GetAgents(remoteFriendStringIds.ToArray()); | 556 | PresenceInfo[] friendSessions = PresenceService.GetAgents(remoteFriendStringIds.ToArray()); |
557 | if(friendSessions == null) | ||
558 | return; | ||
555 | 559 | ||
556 | foreach (PresenceInfo friendSession in friendSessions) | 560 | foreach (PresenceInfo friendSession in friendSessions) |
557 | { | 561 | { |