Merge branch 'avination' of ssh://melanie@3dhosting.de/var/git/careminster into avination

2012-08-07 20:49:49 +01:00 · 2012-08-07 20:49:49 +01:00 · 96922543b4
parent 1c51ae662c 7ff812066f
commit 96922543b4
1 changed files with 7 additions and 0 deletions
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@ -3585,6 +3585,13 @@ namespace OpenSim.Region.Framework.Scenes
            // m_reprioritizationTimer.Dispose(); 

            RemoveFromPhysicalScene();
+          
+            m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
+
+//            if (Animator != null)
+//                Animator.Close();
+            Animator = null;
+
        }

        public void AddAttachment(SceneObjectGroup gobj)