From de6f147d3c2f178b47c4fffddb85925f75e6d88f Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 26 Oct 2012 21:16:27 +0100
Subject: Revert "Fix for Mantis 0006376: Avatar no longer show Walking
 animation when any AO hud is"

This reverts commit fa484c3494a7190b4d7526094347be74d091e125.
---
 OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/Animation')

diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
index 9ed4f47..ad421ee 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             {
                 if (m_defaultAnimation.AnimID == animID)
                 {
-                     m_defaultAnimation = new OpenSim.Framework.Animation(animID, 1, UUID.Zero);
+                    m_defaultAnimation = new OpenSim.Framework.Animation(UUID.Zero, 1, UUID.Zero);
                 }
                 else if (HasAnimation(animID))
                 {
-- 
cgit v1.1


From 1c5f6e48b80e15f97c8203f3db0df6745c7a2283 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 26 Oct 2012 21:23:20 +0100
Subject: Separate LSL's notion of the default anim from the actually playing
 anims.

---
 OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Animation')

diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
index ad421ee..3d8e8be 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
@@ -41,12 +41,13 @@ namespace OpenSim.Region.Framework.Scenes.Animation
     {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        private OpenSim.Framework.Animation m_implicitDefaultAnimation = new OpenSim.Framework.Animation();
         private OpenSim.Framework.Animation m_defaultAnimation = new OpenSim.Framework.Animation();
         private List<OpenSim.Framework.Animation> m_animations = new List<OpenSim.Framework.Animation>();
 
-        public OpenSim.Framework.Animation DefaultAnimation 
+        public OpenSim.Framework.Animation ImplicitDefaultAnimation 
         {
-            get { return m_defaultAnimation; } 
+            get { return m_implicitDefaultAnimation; } 
         }
         
         public AnimationSet()
@@ -119,6 +120,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             if (m_defaultAnimation.AnimID != animID)
             {
                 m_defaultAnimation = new OpenSim.Framework.Animation(animID, sequenceNum, objectID);
+                m_implicitDefaultAnimation = m_defaultAnimation;
                 return true;
             }
             return false;
-- 
cgit v1.1