aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-11 16:23:15 +0000
committerMelanie Thielker2008-10-11 16:23:15 +0000
commit625c67de5475f6665368ad1d5c8494bfa18d5569 (patch)
tree117a401ddd4b4120bef16923d66d11b4ccdc5e94 /OpenSim/Region/Environment
parentMake a missing or read-only estate_settings.xml non-fatal (diff)
downloadopensim-SC_OLD-625c67de5475f6665368ad1d5c8494bfa18d5569.zip
opensim-SC_OLD-625c67de5475f6665368ad1d5c8494bfa18d5569.tar.gz
opensim-SC_OLD-625c67de5475f6665368ad1d5c8494bfa18d5569.tar.bz2
opensim-SC_OLD-625c67de5475f6665368ad1d5c8494bfa18d5569.tar.xz
Fix Nebadon's WP crash (invalid root part from database null-ref)
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs3
1 files changed, 3 insertions, 0 deletions
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
249 /// </returns> 249 /// </returns>
250 protected bool AddSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) 250 protected bool AddSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
251 { 251 {
252 if (sceneObject.RootPart == null)
253 return false;
254
252 sceneObject.ApplyPhysics(m_parentScene.m_physicalPrim); 255 sceneObject.ApplyPhysics(m_parentScene.m_physicalPrim);
253 sceneObject.ScheduleGroupForFullUpdate(); 256 sceneObject.ScheduleGroupForFullUpdate();
254 257