aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-18 17:21:33 +0000
committerMelanie Thielker2008-11-18 17:21:33 +0000
commit9d7e503ce3dd19ede611f7831d455aae5bf6e1e1 (patch)
tree83d439c2a1bbdeb16c759c10565f92388d68f884
parentFixed MySQL and SQLite so they will save the (diff)
downloadopensim-SC_OLD-9d7e503ce3dd19ede611f7831d455aae5bf6e1e1.zip
opensim-SC_OLD-9d7e503ce3dd19ede611f7831d455aae5bf6e1e1.tar.gz
opensim-SC_OLD-9d7e503ce3dd19ede611f7831d455aae5bf6e1e1.tar.bz2
opensim-SC_OLD-9d7e503ce3dd19ede611f7831d455aae5bf6e1e1.tar.xz
Prevent a nullref when building new prims while others watch
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs2
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
1772 AdaptTree(ref shape); 1772 AdaptTree(ref shape);
1773 } 1773 }
1774 1774
1775 sceneObject.SetGroup(groupID, null);
1776 AddNewSceneObject(sceneObject, true); 1775 AddNewSceneObject(sceneObject, true);
1776 sceneObject.SetGroup(groupID, null);
1777 1777
1778 return sceneObject; 1778 return sceneObject;
1779 } 1779 }
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
1699 1699
1700 public void QueueForUpdateCheck() 1700 public void QueueForUpdateCheck()
1701 { 1701 {
1702 if (m_scene == null) // Need to check here as it's null during object creation
1703 return;
1702 m_scene.m_sceneGraph.AddToUpdateList(this); 1704 m_scene.m_sceneGraph.AddToUpdateList(this);
1703 } 1705 }
1704 1706