aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-14 02:16:51 +0000
committerTeravus Ovares2008-05-14 02:16:51 +0000
commit60146691ea0d2d8be753cccad43329d1147f8e3c (patch)
tree4a06ab88bcd7088e1ddbdfa0e47d266df22a11cc /OpenSim/Region/Environment/Modules
parent* Applying Melanie's FriendList related crash patch. She discovered that .N... (diff)
downloadopensim-SC_OLD-60146691ea0d2d8be753cccad43329d1147f8e3c.zip
opensim-SC_OLD-60146691ea0d2d8be753cccad43329d1147f8e3c.tar.gz
opensim-SC_OLD-60146691ea0d2d8be753cccad43329d1147f8e3c.tar.bz2
opensim-SC_OLD-60146691ea0d2d8be753cccad43329d1147f8e3c.tar.xz
* Added the same catch on the 2nd place that objects fail to lock.
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index 9078a14..2d6e27f 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
@@ -238,6 +238,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
238 // prevents a sim crash. 238 // prevents a sim crash.
239 m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); 239 m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off");
240 } 240 }
241 catch (ArgumentOutOfRangeException)
242 {
243 // Ignore the index out of range exception.
244 // This causes friend lists to get out of sync slightly.. however
245 // prevents a sim crash.
246 m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off");
247 }
241 248
242 for (int j = 0; j < flfli.Count; j++) 249 for (int j = 0; j < flfli.Count; j++)
243 { 250 {