2 files changed, 22 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs b/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs
index db4003e..31fdb2c 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs
@@ -80,5 +80,22 @@ namespace OpenSim.Region.Framework.Scenes
 
             return UUID.Zero;
         }
+
+        public Dictionary<string, UUID> CloneAOPairs()
+        {
+            lock (m_overrides)
+            {
+                return new Dictionary<string, UUID>(m_overrides);
+            }
+        }
+
+        public void CopyAOPairsFrom(Dictionary<string, UUID> src)
+        {
+            lock (m_overrides)
+            {
+                m_overrides.Clear();
+                m_overrides = new Dictionary<string, UUID>(src);
+            }
+        }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b6eb4e4..7c515d5 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -4212,6 +4212,8 @@ namespace OpenSim.Region.Framework.Scenes
             cAgent.DefaultAnim = Animator.Animations.DefaultAnimation;
             cAgent.AnimState = Animator.Animations.ImplicitDefaultAnimation;
 
+            cAgent.MovementAnimationOverRides = Overrides.CloneAOPairs();
+
             if (Scene.AttachmentsModule != null)
                 Scene.AttachmentsModule.CopyAttachments(this, cAgent);
         }
@@ -4282,7 +4284,9 @@ namespace OpenSim.Region.Framework.Scenes
             catch { }
 
             Animator.ResetAnimations();
-           
+
+            Overrides.CopyAOPairsFrom(cAgent.MovementAnimationOverRides);
+
             // FIXME: Why is this null check necessary?  Where are the cases where we get a null Anims object?
             if (cAgent.DefaultAnim != null)
                 Animator.Animations.SetDefaultAnimation(cAgent.DefaultAnim.AnimID, cAgent.DefaultAnim.SequenceNum, UUID.Zero);