From 625c67de5475f6665368ad1d5c8494bfa18d5569 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 11 Oct 2008 16:23:15 +0000
Subject: Fix Nebadon's WP crash (invalid root part from database null-ref)

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

(limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')

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();
 
-- 
cgit v1.1