diff options
| author | Homer Horwitz | 2008-11-03 22:02:52 +0000 |
|---|---|---|
| committer | Homer Horwitz | 2008-11-03 22:02:52 +0000 |
| commit | 39691e61a2cbfc59dcba6882c61943f7a19491b0 (patch) | |
| tree | 0816849d575eef71438b456b56848630e5ded70b /OpenSim | |
| parent | * Expose a client_throttle_multiplier setting in OpenSim.ini. This multiplie... (diff) | |
| download | opensim-SC_OLD-39691e61a2cbfc59dcba6882c61943f7a19491b0.zip opensim-SC_OLD-39691e61a2cbfc59dcba6882c61943f7a19491b0.tar.gz opensim-SC_OLD-39691e61a2cbfc59dcba6882c61943f7a19491b0.tar.bz2 opensim-SC_OLD-39691e61a2cbfc59dcba6882c61943f7a19491b0.tar.xz | |
Small fix for a possible NRE in standalone mode, killing the
client-thread. Will hopefully fix Mantis#2536.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs index 33ca632..58251cb 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs | |||
| @@ -885,7 +885,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends | |||
| 885 | { | 885 | { |
| 886 | UUID uuid = friendIDsToReceiveFromOffline[i]; | 886 | UUID uuid = friendIDsToReceiveFromOffline[i]; |
| 887 | FriendRegionInfo info; | 887 | FriendRegionInfo info; |
| 888 | if (friendRegions.TryGetValue(uuid, out info) && info.isOnline) | 888 | if (friendRegions.TryGetValue(uuid, out info) && info != null && info.isOnline) |
| 889 | { | 889 | { |
| 890 | friendIDsToReceiveFromOffline.RemoveAt(i); | 890 | friendIDsToReceiveFromOffline.RemoveAt(i); |
| 891 | friendIDsToReceiveFromOnline.Add(uuid); | 891 | friendIDsToReceiveFromOnline.Add(uuid); |
| @@ -906,7 +906,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends | |||
| 906 | { | 906 | { |
| 907 | UUID uuid = friendIDsToSendTo[i]; | 907 | UUID uuid = friendIDsToSendTo[i]; |
| 908 | FriendRegionInfo info; | 908 | FriendRegionInfo info; |
| 909 | if (friendRegions.TryGetValue(uuid, out info) && info.isOnline) | 909 | if (friendRegions.TryGetValue(uuid, out info) && info != null && info.isOnline) |
| 910 | { | 910 | { |
| 911 | // any client is good enough, root or child... | 911 | // any client is good enough, root or child... |
| 912 | ScenePresence agent = GetAnyPresenceFromAgentID(uuid); | 912 | ScenePresence agent = GetAnyPresenceFromAgentID(uuid); |