diff options
| author | Melanie | 2012-08-03 19:53:41 +0200 |
|---|---|---|
| committer | Melanie | 2012-08-03 19:53:41 +0200 |
| commit | 7ff812066f29afc555e622e8e99362e00d47cbda (patch) | |
| tree | 9fbce7f57414de0ad06e5a9d402459599bba3881 /OpenSim/Region/Framework | |
| parent | Merge branch 'careminster' into avination (diff) | |
| parent | on presence close(), release animator and OnRegionHeartbeatEnd event (diff) | |
| download | opensim-SC_OLD-7ff812066f29afc555e622e8e99362e00d47cbda.zip opensim-SC_OLD-7ff812066f29afc555e622e8e99362e00d47cbda.tar.gz opensim-SC_OLD-7ff812066f29afc555e622e8e99362e00d47cbda.tar.bz2 opensim-SC_OLD-7ff812066f29afc555e622e8e99362e00d47cbda.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 4d3ab51..47b2ead 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3585,6 +3585,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3585 | // m_reprioritizationTimer.Dispose(); | 3585 | // m_reprioritizationTimer.Dispose(); |
| 3586 | 3586 | ||
| 3587 | RemoveFromPhysicalScene(); | 3587 | RemoveFromPhysicalScene(); |
| 3588 | |||
| 3589 | m_scene.EventManager.OnRegionHeartbeatEnd -= RegionHeartbeatEnd; | ||
| 3590 | |||
| 3591 | // if (Animator != null) | ||
| 3592 | // Animator.Close(); | ||
| 3593 | Animator = null; | ||
| 3594 | |||
| 3588 | } | 3595 | } |
| 3589 | 3596 | ||
| 3590 | public void AddAttachment(SceneObjectGroup gobj) | 3597 | public void AddAttachment(SceneObjectGroup gobj) |