From 1bd33aa51a428c0c3bf9b48a05609e66eaefa5b9 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 18 Oct 2008 15:43:02 +0000
Subject: Prevent a null root part from stopping objects from being persisted,
 also remove any such objectsd from backup

---
 OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index ca62b6d..fa4f936 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1158,6 +1158,13 @@ namespace OpenSim.Region.Environment.Scenes
         {
             // Since this is the top of the section of call stack for backing up a particular scene object, don't let
             // any exception propogate upwards.
+
+            if (RootPart == null || UUID == UUID.Zero)
+            {
+                DetachFromBackup();
+                return;
+            }
+
             try
             {
                 ILandObject parcel = m_scene.LandChannel.GetLandObject(
-- 
cgit v1.1