aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
diff options
context:
space:
mode:
authorMelanie2011-07-15 12:08:40 -0700
committerMelanie2011-07-15 19:36:00 +0200
commitc7dbd7cbd035ccc412624cd221348479d43798d6 (patch)
treef1e1791757cef6d0818d7c5d16b9fec687bf55cc /OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
parentRevert "Add localid support to ch0de properly" (diff)
downloadopensim-SC-c7dbd7cbd035ccc412624cd221348479d43798d6.zip
opensim-SC-c7dbd7cbd035ccc412624cd221348479d43798d6.tar.gz
opensim-SC-c7dbd7cbd035ccc412624cd221348479d43798d6.tar.bz2
opensim-SC-c7dbd7cbd035ccc412624cd221348479d43798d6.tar.xz
Fox some local id issues in physics glue
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs8
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
index f4245b6..8e9edac 100644
--- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
+++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
@@ -626,13 +626,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin
626 } 626 }
627 627
628 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, OpenMetaverse.Vector3 position, 628 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, OpenMetaverse.Vector3 position,
629 OpenMetaverse.Vector3 size, OpenMetaverse.Quaternion rotation) 629 OpenMetaverse.Vector3 size, OpenMetaverse.Quaternion rotation, bool isPhysical, uint localid)
630 {
631 return AddPrimShape(primName, pbs, position, size, rotation, false);
632 }
633
634 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, OpenMetaverse.Vector3 position,
635 OpenMetaverse.Vector3 size, OpenMetaverse.Quaternion rotation, bool isPhysical)
636 { 630 {
637 PhysicsActor result; 631 PhysicsActor result;
638 632