diff options
author | Diva Canto | 2010-08-05 09:41:24 -0700 |
---|---|---|
committer | Diva Canto | 2010-08-05 09:41:24 -0700 |
commit | dc08e1cbf98378f2ed17fd9b370a8a7cad39dab3 (patch) | |
tree | 1b04b36477daa587d7e03be0ff764c53ef75234f /OpenSim/Region | |
parent | Better debug messages (diff) | |
download | opensim-SC_OLD-dc08e1cbf98378f2ed17fd9b370a8a7cad39dab3.zip opensim-SC_OLD-dc08e1cbf98378f2ed17fd9b370a8a7cad39dab3.tar.gz opensim-SC_OLD-dc08e1cbf98378f2ed17fd9b370a8a7cad39dab3.tar.bz2 opensim-SC_OLD-dc08e1cbf98378f2ed17fd9b370a8a7cad39dab3.tar.xz |
Addresses http://opensimulator.org/mantis/view.php?id=4919
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 6c119c2..fd58244 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -930,7 +930,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
930 | /// </summary> | 930 | /// </summary> |
931 | public void MakeChildAgent() | 931 | public void MakeChildAgent() |
932 | { | 932 | { |
933 | Animator.ResetAnimations(); | 933 | // It looks like m_animator is set to null somewhere, and MakeChild |
934 | // is called after that. Probably in aborted teleports. | ||
935 | if (m_animator == null) | ||
936 | m_animator = new ScenePresenceAnimator(this); | ||
937 | else | ||
938 | Animator.ResetAnimations(); | ||
934 | 939 | ||
935 | // m_log.DebugFormat( | 940 | // m_log.DebugFormat( |
936 | // "[SCENEPRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}", | 941 | // "[SCENEPRESENCE]: Downgrading root agent {0}, {1} to a child agent in {2}", |