Fix Nebadon's WP crash (invalid root part from database null-ref)

1 files changed, 3 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 80d0151..1dcb174 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -249,6 +249,9 @@ namespace OpenSim.Region.Environment.Scenes
         /// </returns>
         protected bool AddSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
         {
+            if (sceneObject.RootPart == null)
+                return false;
+
             sceneObject.ApplyPhysics(m_parentScene.m_physicalPrim);
             sceneObject.ScheduleGroupForFullUpdate();