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

avinationmerge
Melanie 2012-08-07 20:49:49 +01:00
commit 96922543b4
1 changed files with 7 additions and 0 deletions

View File

@ -3585,6 +3585,13 @@ namespace OpenSim.Region.Framework.Scenes
// m_reprioritizationTimer.Dispose(); // m_reprioritizationTimer.Dispose();
RemoveFromPhysicalScene(); RemoveFromPhysicalScene();
m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd;
// if (Animator != null)
// Animator.Close();
Animator = null;
} }
public void AddAttachment(SceneObjectGroup gobj) public void AddAttachment(SceneObjectGroup gobj)