Revert "Merge master into teravuswork", it should have been avination, not master.

This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.

1 files changed, 0 insertions, 13 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
index 65ae445..ad421ee 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
@@ -41,7 +41,6 @@ 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>();
 
@@ -50,11 +49,6 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             get { return m_defaultAnimation; } 
         }
         
-        public OpenSim.Framework.Animation ImplicitDefaultAnimation 
-        {
-            get { return m_implicitDefaultAnimation; } 
-        }
-        
         public AnimationSet()
         {
             ResetDefaultAnimation();
@@ -125,18 +119,11 @@ 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;
         }
 
-        // Called from serialization only
-        public void SetImplicitDefaultAnimation(UUID animID, int sequenceNum, UUID objectID)
-        {
-            m_implicitDefaultAnimation = new OpenSim.Framework.Animation(animID, sequenceNum, objectID);
-        }
-
         protected bool ResetDefaultAnimation()
         {
             return TrySetDefaultAnimation("STAND", 1, UUID.Zero);