diff options
author | Melanie | 2011-07-15 19:35:49 +0200 |
---|---|---|
committer | Melanie | 2011-07-15 19:35:49 +0200 |
commit | 8dff9d564dfbf4841f03a919df44e8ae3d76de25 (patch) | |
tree | 787a083ac9efc5e3a67f271e7fe6bc4a22d0ea94 /OpenSim/Region/Physics/BulletXPlugin | |
parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
download | opensim-SC-8dff9d564dfbf4841f03a919df44e8ae3d76de25.zip opensim-SC-8dff9d564dfbf4841f03a919df44e8ae3d76de25.tar.gz opensim-SC-8dff9d564dfbf4841f03a919df44e8ae3d76de25.tar.bz2 opensim-SC-8dff9d564dfbf4841f03a919df44e8ae3d76de25.tar.xz |
Revert "Add localid support to ch0de properly"
This reverts commit bb402d0d95c934fbcd8b1c03e228ec1d0a14f14d.
Diffstat (limited to 'OpenSim/Region/Physics/BulletXPlugin')
-rw-r--r-- | OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs index 8e9edac..f4245b6 100644 --- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs +++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs | |||
@@ -626,7 +626,13 @@ 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, bool isPhysical, uint localid) | 629 | OpenMetaverse.Vector3 size, OpenMetaverse.Quaternion rotation) |
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) | ||
630 | { | 636 | { |
631 | PhysicsActor result; | 637 | PhysicsActor result; |
632 | 638 | ||