Prevent a null root part from stopping objects from being persisted, also

remove any such objectsd from backup

1 files changed, 7 insertions, 0 deletions

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(