From 288c4f4a446632e58b3da49ee93d9145c0bd0c7b Mon Sep 17 00:00:00 2001
From: Brian McBee
Date: Mon, 21 Jan 2008 22:13:08 +0000
Subject: Attempt to catch animation fubar on region crossing that causes
 client hang. Mantis 319.

---
 OpenSim/Region/Environment/Scenes/ScenePresence.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

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();
-- 
cgit v1.1