From f8e0cf0f1de3cabded7bce2e438cc37ce4bb989c Mon Sep 17 00:00:00 2001
From: darok
Date: Sat, 3 Nov 2007 10:25:43 +0000
Subject: Changes in BulletXPlugin: Added new class BulletXActor class inherits
 from PhysicsActor and it's the ancestor for BulletXCharacter and
 BulletXPrim.Physical modifications: Changes for pass the value of Physical
 flag in the SceneObjectPart class to the Physics engines. New call for
 AddPrimShape so it has a new parameter called "isPhysical". The old call will
 be obselete soon (i believe). PhysActor and its descendants have a new
 property called IsPhysical. By the way no new special funcionallity added.
 It's more like preparing the way for new modifications.

---
 OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 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 38eaf90..d0edff3 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -672,6 +672,15 @@ namespace OpenSim.Region.Environment.Scenes
                 //Silently ignore it - TODO: FIXME Quick
             }
 
+            if (UsePhysics)
+            {
+                AddFlag(LLObject.ObjectFlags.Physics);
+            }
+            else
+            {
+                RemFlag(LLObject.ObjectFlags.Physics);
+            }
+
             if (IsPhantom)
             {
                 AddFlag(LLObject.ObjectFlags.Phantom);
@@ -694,18 +703,10 @@ namespace OpenSim.Region.Environment.Scenes
                                           AbsolutePosition.Z),
                         new PhysicsVector(Scale.X, Scale.Y, Scale.Z),
                         new Quaternion(RotationOffset.W, RotationOffset.X,
-                                       RotationOffset.Y, RotationOffset.Z));
+                                       RotationOffset.Y, RotationOffset.Z), UsePhysics);
                 }
             }
 
-            if (UsePhysics)
-            {
-                AddFlag(LLObject.ObjectFlags.Physics);
-            }
-            else
-            {
-                RemFlag(LLObject.ObjectFlags.Physics);
-            }
             if (IsTemporary)
             {
                 AddFlag(LLObject.ObjectFlags.TemporaryOnRez);
-- 
cgit v1.1