BulletSim: fix exceptions caused by setting physical properties before the prim body is initialized.

1 files changed, 10 insertions, 5 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index a86932a..38adb72 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -587,7 +587,8 @@ public sealed class BSPrim : BSPhysObject
         base.SetMaterial(material);
         PhysicsScene.TaintedObject("BSPrim.SetMaterial", delegate()
         {
-            UpdatePhysicalParameters();
+            if (PhysBody.HasPhysicalBody)
+                UpdatePhysicalParameters();
         });
     }
     public override float Friction
@@ -600,7 +601,8 @@ public sealed class BSPrim : BSPhysObject
                 base.Friction = value;
                 PhysicsScene.TaintedObject("BSPrim.setFriction", delegate()
                 {
-                    UpdatePhysicalParameters();
+                    if (PhysBody.HasPhysicalBody)
+                        UpdatePhysicalParameters();
                 });
             }
         }
@@ -615,7 +617,8 @@ public sealed class BSPrim : BSPhysObject
                 base.Restitution = value;
                 PhysicsScene.TaintedObject("BSPrim.setRestitution", delegate()
                 {
-                    UpdatePhysicalParameters();
+                    if (PhysBody.HasPhysicalBody)
+                        UpdatePhysicalParameters();
                 });
             }
         }
@@ -630,7 +633,8 @@ public sealed class BSPrim : BSPhysObject
                 base.Density = value;
                 PhysicsScene.TaintedObject("BSPrim.setDensity", delegate()
                 {
-                    UpdatePhysicalParameters();
+                    if (PhysBody.HasPhysicalBody)
+                        UpdatePhysicalParameters();
                 });
             }
         }
@@ -645,7 +649,8 @@ public sealed class BSPrim : BSPhysObject
                 base.GravityModifier = value;
                 PhysicsScene.TaintedObject("BSPrim.setGravityModifier", delegate()
                 {
-                    UpdatePhysicalParameters();
+                    if (PhysBody.HasPhysicalBody)
+                        UpdatePhysicalParameters();
                 });
             }
         }