aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-14 02:14:05 +0000
committerTeravus Ovares2008-05-14 02:14:05 +0000
commitfd035ec1f85eaff3f4d94541fbefb9d9d72b085b (patch)
tree6e08e9b27620aec3ea5489429005969dc718b251 /OpenSim/Region/Environment
parent* Tweaked a regex that was returning invalid results in some cases. (diff)
downloadopensim-SC_OLD-fd035ec1f85eaff3f4d94541fbefb9d9d72b085b.zip
opensim-SC_OLD-fd035ec1f85eaff3f4d94541fbefb9d9d72b085b.tar.gz
opensim-SC_OLD-fd035ec1f85eaff3f4d94541fbefb9d9d72b085b.tar.bz2
opensim-SC_OLD-fd035ec1f85eaff3f4d94541fbefb9d9d72b085b.tar.xz
* Applying Melanie's FriendList related crash patch. She discovered that .NET throws a different error then mono does. Thanks Melanie!
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index dd6a92e..9078a14 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
@@ -256,6 +256,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
256 // prevents a sim crash. 256 // prevents a sim crash.
257 m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); 257 m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off");
258 } 258 }
259 catch (ArgumentOutOfRangeException)
260 {
261 // Ignore the index out of range exception.
262 // This causes friend lists to get out of sync slightly.. however
263 // prevents a sim crash.
264 m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off");
265 }
259 } 266 }
260 } 267 }
261 268
@@ -498,4 +505,4 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
498 505
499 #endregion 506 #endregion
500 } 507 }
501} \ No newline at end of file 508}