aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletDotNETPlugin
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/BulletDotNETPlugin
parentRevert "Add localid support to ch0de properly" (diff)
downloadopensim-SC_OLD-c7dbd7cbd035ccc412624cd221348479d43798d6.zip
opensim-SC_OLD-c7dbd7cbd035ccc412624cd221348479d43798d6.tar.gz
opensim-SC_OLD-c7dbd7cbd035ccc412624cd221348479d43798d6.tar.bz2
opensim-SC_OLD-c7dbd7cbd035ccc412624cd221348479d43798d6.tar.xz
Fox some local id issues in physics glue
Diffstat (limited to 'OpenSim/Region/Physics/BulletDotNETPlugin')
-rw-r--r--OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs7
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
index 6df213d..0d1bd82 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
@@ -213,12 +213,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
213 return newPrim; 213 return newPrim;
214 } 214 }
215 215
216 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, Vector3 size, Quaternion rotation) 216 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, Vector3 size, Quaternion rotation, bool isPhysical, uint localid)
217 {
218 return AddPrimShape(primName, pbs, position, size, rotation, false);
219 }
220
221 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, Vector3 size, Quaternion rotation, bool isPhysical)
222 { 217 {
223 PhysicsActor result; 218 PhysicsActor result;
224 IMesh mesh = null; 219 IMesh mesh = null;