From 44b2ecf29db58bfdc3ecf0682cec9fc6e94dd4ee Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 11 Oct 2008 16:32:31 +0000
Subject: 2nd stab at that prim loading nasty

---
 OpenSim/Region/Environment/Scenes/InnerScene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Environment/Scenes')

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