Attempt to catch animation fubar on region crossing that causes client hang. Mantis 319.

1 files changed, 11 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 0a1977a..c8310e4 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1010,8 +1010,18 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         protected void SetMovementAnimation(LLUUID anim, int seq)
         {
-            if (m_animations[0] != anim)
+            try
+            {
+                if (m_animations[0] != anim)
+                {
+                    m_animations[0] = anim;
+                    m_animationSeqs[0] = seq;
+                    SendAnimPack();
+                }
+            }
+            catch
             {
+                MainLog.Instance.Warn("AVATAR", "SetMovementAnimation for avatar failed. Attempting recovery...");
                 m_animations[0] = anim;
                 m_animationSeqs[0] = seq;
                 SendAnimPack();