Prevent a nullref when building new prims while others watch

2 files changed, 3 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index e374bba..7ea4686 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1772,8 +1772,8 @@ namespace OpenSim.Region.Environment.Scenes
                     AdaptTree(ref shape);
             }
 
-            sceneObject.SetGroup(groupID, null);
             AddNewSceneObject(sceneObject, true);
+            sceneObject.SetGroup(groupID, null);
 
             return sceneObject;
         }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 380557b..2d62d66 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1699,6 +1699,8 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void QueueForUpdateCheck()
         {
+            if (m_scene == null) // Need to check here as it's null during object creation
+                return;
             m_scene.m_sceneGraph.AddToUpdateList(this);
         }