From dc08e1cbf98378f2ed17fd9b370a8a7cad39dab3 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 5 Aug 2010 09:41:24 -0700 Subject: [PATCH] Addresses http://opensimulator.org/mantis/view.php?id=4919 --- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 6c119c2f5c..fd5824404d 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -930,7 +930,12 @@ namespace OpenSim.Region.Framework.Scenes /// public void MakeChildAgent() { - Animator.ResetAnimations(); + // 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( // "[SCENEPRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}",