aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-08-05 09:41:24 -0700
committerDiva Canto2010-08-05 09:43:19 -0700
commit847008ee073f14901c607d8987f4c77dcfede590 (patch)
treefa05dabf56707333172c170af5da8fd13cf11751
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-847008ee073f14901c607d8987f4c77dcfede590.zip
opensim-SC_OLD-847008ee073f14901c607d8987f4c77dcfede590.tar.gz
opensim-SC_OLD-847008ee073f14901c607d8987f4c77dcfede590.tar.bz2
opensim-SC_OLD-847008ee073f14901c607d8987f4c77dcfede590.tar.xz
Addresses http://opensimulator.org/mantis/view.php?id=4919
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 1e8ce22..e073a9b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -929,7 +929,12 @@ namespace OpenSim.Region.Framework.Scenes
929 /// </summary> 929 /// </summary>
930 public void MakeChildAgent() 930 public void MakeChildAgent()
931 { 931 {
932 Animator.ResetAnimations(); 932 // It looks like m_animator is set to null somewhere, and MakeChild
933 // is called after that. Probably in aborted teleports.
934 if (m_animator == null)
935 m_animator = new ScenePresenceAnimator(this);
936 else
937 Animator.ResetAnimations();
933 938
934// m_log.DebugFormat( 939// m_log.DebugFormat(
935// "[SCENEPRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}", 940// "[SCENEPRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}",