diff options
| author | UbitUmarov | 2012-08-30 00:31:03 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-08-30 00:31:03 +0100 |
| commit | 1eb7d963cfb5673c92564e3e9d9f26803543b3bb (patch) | |
| tree | 4c5462d294adb39bd6867f48cd805ce91f8662b2 /OpenSim/Region/Framework | |
| parent | [possible still bad] make use of keyframemotion.copy on sop.copy, replacing (diff) | |
| parent | Fix issue with the quit packet being stuck int he queue and a one packet delay. (diff) | |
| download | opensim-SC-1eb7d963cfb5673c92564e3e9d9f26803543b3bb.zip opensim-SC-1eb7d963cfb5673c92564e3e9d9f26803543b3bb.tar.gz opensim-SC-1eb7d963cfb5673c92564e3e9d9f26803543b3bb.tar.bz2 opensim-SC-1eb7d963cfb5673c92564e3e9d9f26803543b3bb.tar.xz | |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index fe34ad4..df4bd0d 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -3034,7 +3034,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3034 | /// <param name="objectGroup"></param> | 3034 | /// <param name="objectGroup"></param> |
| 3035 | public virtual void DetachFromBackup() | 3035 | public virtual void DetachFromBackup() |
| 3036 | { | 3036 | { |
| 3037 | m_scene.SceneGraph.FireDetachFromBackup(this); | 3037 | if (m_scene != null) |
| 3038 | m_scene.SceneGraph.FireDetachFromBackup(this); | ||
| 3038 | if (m_isBackedUp && Scene != null) | 3039 | if (m_isBackedUp && Scene != null) |
| 3039 | m_scene.EventManager.OnBackup -= ProcessBackup; | 3040 | m_scene.EventManager.OnBackup -= ProcessBackup; |
| 3040 | 3041 | ||