Consolidated LoadAnims and AvatarAnimations constructor.

Fixes locking issues with Animations in ScenePresence (bug #324)

1 files changed, 2 insertions, 14 deletions

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 5c33dfc..109f23c 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -41,8 +41,9 @@ namespace OpenSim.Region.Environment.Scenes
     {
         private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
-        public static AvatarAnimations Animations;
+        public static AvatarAnimations Animations = new AvatarAnimations();
         public static byte[] DefaultTexture;
+
         public LLUUID currentParcelUUID = LLUUID.Zero;
         private List<LLUUID> m_animations = new List<LLUUID>();
         private List<int> m_animationSeqs = new List<int>();
@@ -333,12 +334,6 @@ namespace OpenSim.Region.Environment.Scenes
 
             AbsolutePosition = m_controllingClient.StartPos;
 
-            Animations = new AvatarAnimations();
-            lock (Animations)
-            {
-                Animations.LoadAnims();
-            }
-
             // TODO: m_animations and m_animationSeqs should always be of the same length.
             // Move them into an object to (hopefully) avoid threading issues.
             try
@@ -1643,13 +1638,6 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         /// <summary>
-        /// 
-        /// </summary>
-        public static void LoadAnims()
-        {
-        }
-
-        /// <summary>
         /// Handles part of the PID controller function for moving an avatar.
         /// </summary>
         public override void UpdateMovement()