aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorubit2012-08-30 01:29:43 +0200
committerubit2012-08-30 01:29:43 +0200
commit194eb78b90f302f882be7be7843f00fc3aed0002 (patch)
tree6f95b537ff2b641457914c04708aa3f2e909f668 /OpenSim/Region/Framework
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentFix issue with the quit packet being stuck int he queue and a one packet delay. (diff)
downloadopensim-SC-194eb78b90f302f882be7be7843f00fc3aed0002.zip
opensim-SC-194eb78b90f302f882be7be7843f00fc3aed0002.tar.gz
opensim-SC-194eb78b90f302f882be7be7843f00fc3aed0002.tar.bz2
opensim-SC-194eb78b90f302f882be7be7843f00fc3aed0002.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 834d27b..5052683 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3033,7 +3033,8 @@ namespace OpenSim.Region.Framework.Scenes
3033 /// <param name="objectGroup"></param> 3033 /// <param name="objectGroup"></param>
3034 public virtual void DetachFromBackup() 3034 public virtual void DetachFromBackup()
3035 { 3035 {
3036 m_scene.SceneGraph.FireDetachFromBackup(this); 3036 if (m_scene != null)
3037 m_scene.SceneGraph.FireDetachFromBackup(this);
3037 if (m_isBackedUp && Scene != null) 3038 if (m_isBackedUp && Scene != null)
3038 m_scene.EventManager.OnBackup -= ProcessBackup; 3039 m_scene.EventManager.OnBackup -= ProcessBackup;
3039 3040