Addresses http://opensimulator.org/mantis/view.php?id=4919

2010-08-05 09:41:24 -07:00 · 2010-08-05 09:41:24 -07:00 · 847008ee07
parent 9e9296848d
commit 847008ee07
1 changed files with 6 additions and 1 deletions
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@ -929,6 +929,11 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        public void MakeChildAgent()
        {
+            // It looks like m_animator is set to null somewhere, and MakeChild
+            // is called after that. Probably in aborted teleports.
+            if (m_animator == null)
+                m_animator = new ScenePresenceAnimator(this);
+            else
                Animator.ResetAnimations();

 //            m_log.DebugFormat(