From 76bf1f365455ec19b277404184a0ab24e1281dde Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sun, 16 Mar 2008 18:55:56 +0000
Subject: * Fixed prim creation in basic physics mode. ( BasicPhysics returns
 null probably a lot more then it should? )

---
 OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 4614709..e9d4c66 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -785,9 +785,13 @@ namespace OpenSim.Region.Environment.Scenes
                     new PhysicsVector(Scale.X, Scale.Y, Scale.Z),
                     new Quaternion(RotationOffset.W, RotationOffset.X,
                                    RotationOffset.Y, RotationOffset.Z), RigidBody);
-                PhysActor.LocalID = LocalId;
-
-                DoPhysicsPropertyUpdate(RigidBody, true);
+                
+                // Basic Physics returns null..  joy joy joy.
+                if (PhysActor != null)
+                {
+                    PhysActor.LocalID = LocalId;
+                    DoPhysicsPropertyUpdate(RigidBody, true);
+                }
             }
         }
 
-- 
cgit v1.1