OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent a nullref when building new prims while others watch

0.6.1-post-fixes
Melanie Thielker 2008-11-18 17:21:33 +00:00
parent 5517ea3dfd
commit 9d7e503ce3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -1772,8 +1772,8 @@ namespace OpenSim.Region.Environment.Scenes
AdaptTree(ref shape); AdaptTree(ref shape);
} }
sceneObject.SetGroup(groupID, null);
AddNewSceneObject(sceneObject, true); AddNewSceneObject(sceneObject, true);
sceneObject.SetGroup(groupID, null);
return sceneObject; return sceneObject;
} }

2
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -1699,6 +1699,8 @@ namespace OpenSim.Region.Environment.Scenes
public void QueueForUpdateCheck() 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); m_scene.m_sceneGraph.AddToUpdateList(this);
} }