diff options
author | root | 2011-07-15 20:07:59 +0100 |
---|---|---|
committer | root | 2011-07-15 20:07:59 +0100 |
commit | e9dbe54ab1217e4310b0e7e014516363237e2a21 (patch) | |
tree | a7dc65799c92dc288c8d4d3d6c6f0c4adc824380 /OpenSim/Region/Physics/BulletXPlugin | |
parent | fix duplication of physical objects for physics engines that care about the i... (diff) | |
download | opensim-SC-e9dbe54ab1217e4310b0e7e014516363237e2a21.zip opensim-SC-e9dbe54ab1217e4310b0e7e014516363237e2a21.tar.gz opensim-SC-e9dbe54ab1217e4310b0e7e014516363237e2a21.tar.bz2 opensim-SC-e9dbe54ab1217e4310b0e7e014516363237e2a21.tar.xz |
Fix some local id issues in physics glue
Diffstat (limited to 'OpenSim/Region/Physics/BulletXPlugin')
-rw-r--r-- | OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs index e2a6a2e..df62dbc 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 | ||