aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMelanie Thielker2008-10-11 16:32:31 +0000
committerMelanie Thielker2008-10-11 16:32:31 +0000
commit44b2ecf29db58bfdc3ecf0682cec9fc6e94dd4ee (patch)
treef222a1c831a4a40bfc81df721681da95c0a96c60 /OpenSim/Region/Environment
parentFix Nebadon's WP crash (invalid root part from database null-ref) (diff)
downloadopensim-SC_OLD-44b2ecf29db58bfdc3ecf0682cec9fc6e94dd4ee.zip
opensim-SC_OLD-44b2ecf29db58bfdc3ecf0682cec9fc6e94dd4ee.tar.gz
opensim-SC_OLD-44b2ecf29db58bfdc3ecf0682cec9fc6e94dd4ee.tar.bz2
opensim-SC_OLD-44b2ecf29db58bfdc3ecf0682cec9fc6e94dd4ee.tar.xz
2nd stab at that prim loading nasty
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs2
1 files changed, 1 insertions, 1 deletions
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
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) 252 if (sceneObject == null || sceneObject.RootPart == null || sceneObject.RootPart.UUID == null)
253 return false; 253 return false;
254 254
255 sceneObject.ApplyPhysics(m_parentScene.m_physicalPrim); 255 sceneObject.ApplyPhysics(m_parentScene.m_physicalPrim);