aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-21 15:11:59 +0000
committerTeravus Ovares2007-12-21 15:11:59 +0000
commit6a51c3addd936066e1e303d58ed8dcaaeba4c237 (patch)
treeda74cb3c3d2fad6cbd24244c3aa9b75d6f309e86 /OpenSim/Region/Environment/Scenes
parent* Fix for Mantis: 0000229 (diff)
downloadopensim-SC-6a51c3addd936066e1e303d58ed8dcaaeba4c237.zip
opensim-SC-6a51c3addd936066e1e303d58ed8dcaaeba4c237.tar.gz
opensim-SC-6a51c3addd936066e1e303d58ed8dcaaeba4c237.tar.bz2
opensim-SC-6a51c3addd936066e1e303d58ed8dcaaeba4c237.tar.xz
* Fix for Mantis: 0000224
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/AvatarAnimations.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
index 82ecda8..cffe846 100644
--- a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
+++ b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
@@ -60,13 +60,19 @@ namespace OpenSim.Region.Environment.Scenes
60 60
61 // MainLog.Instance.Verbose("CLIENT", "Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); 61 // MainLog.Instance.Verbose("CLIENT", "Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
62 62
63 lock (ScenePresence.Animations.AnimsLLUUID) 63 try
64 { 64 {
65 //Mantis: 0000224: 2755 - Enumeration Operation may not execute [immediate crash] (ODE/2750/WIN2003)
65 foreach (KeyValuePair<string, LLUUID> kp in ScenePresence.Animations.AnimsLLUUID) 66 foreach (KeyValuePair<string, LLUUID> kp in ScenePresence.Animations.AnimsLLUUID)
66 { 67 {
67 AnimsNames.Add(kp.Value, kp.Key); 68 AnimsNames.Add(kp.Value, kp.Key);
68 } 69 }
69 } 70 }
71 catch (System.InvalidOperationException)
72 {
73 OpenSim.Framework.Console.MainLog.Instance.Warn("AVATAR", "Unable to load animation names for an Avatar");
74 }
75
70 } 76 }
71 } 77 }
72} 78}