aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authordarok2007-11-03 10:25:43 +0000
committerdarok2007-11-03 10:25:43 +0000
commitf8e0cf0f1de3cabded7bce2e438cc37ce4bb989c (patch)
treefa9f855fc58616c24bdeed613f7f7edef395ee85 /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
parentAdded temporary try catch to udpserver while testing something out (will remo... (diff)
downloadopensim-SC_OLD-f8e0cf0f1de3cabded7bce2e438cc37ce4bb989c.zip
opensim-SC_OLD-f8e0cf0f1de3cabded7bce2e438cc37ce4bb989c.tar.gz
opensim-SC_OLD-f8e0cf0f1de3cabded7bce2e438cc37ce4bb989c.tar.bz2
opensim-SC_OLD-f8e0cf0f1de3cabded7bce2e438cc37ce4bb989c.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs19
1 files changed, 10 insertions, 9 deletions
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
672 //Silently ignore it - TODO: FIXME Quick 672 //Silently ignore it - TODO: FIXME Quick
673 } 673 }
674 674
675 if (UsePhysics)
676 {
677 AddFlag(LLObject.ObjectFlags.Physics);
678 }
679 else
680 {
681 RemFlag(LLObject.ObjectFlags.Physics);
682 }
683
675 if (IsPhantom) 684 if (IsPhantom)
676 { 685 {
677 AddFlag(LLObject.ObjectFlags.Phantom); 686 AddFlag(LLObject.ObjectFlags.Phantom);
@@ -694,18 +703,10 @@ namespace OpenSim.Region.Environment.Scenes
694 AbsolutePosition.Z), 703 AbsolutePosition.Z),
695 new PhysicsVector(Scale.X, Scale.Y, Scale.Z), 704 new PhysicsVector(Scale.X, Scale.Y, Scale.Z),
696 new Quaternion(RotationOffset.W, RotationOffset.X, 705 new Quaternion(RotationOffset.W, RotationOffset.X,
697 RotationOffset.Y, RotationOffset.Z)); 706 RotationOffset.Y, RotationOffset.Z), UsePhysics);
698 } 707 }
699 } 708 }
700 709
701 if (UsePhysics)
702 {
703 AddFlag(LLObject.ObjectFlags.Physics);
704 }
705 else
706 {
707 RemFlag(LLObject.ObjectFlags.Physics);
708 }
709 if (IsTemporary) 710 if (IsTemporary)
710 { 711 {
711 AddFlag(LLObject.ObjectFlags.TemporaryOnRez); 712 AddFlag(LLObject.ObjectFlags.TemporaryOnRez);