Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/ChildAgentDataUpdate.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

1 files changed, 11 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
index 3d8e8be..65ae445 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
@@ -45,6 +45,11 @@ namespace OpenSim.Region.Framework.Scenes.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 
+        {
+            get { return m_defaultAnimation; } 
+        }
+        
         public OpenSim.Framework.Animation ImplicitDefaultAnimation 
         {
             get { return m_implicitDefaultAnimation; } 
@@ -126,6 +131,12 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             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);