aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
diff options
context:
space:
mode:
authorMelanie2011-07-15 19:35:49 +0200
committerMelanie2011-07-15 19:35:49 +0200
commit8dff9d564dfbf4841f03a919df44e8ae3d76de25 (patch)
tree787a083ac9efc5e3a67f271e7fe6bc4a22d0ea94 /OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-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 '')
-rw-r--r--OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
index 0d1bd82..6df213d 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
@@ -213,7 +213,12 @@ 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, bool isPhysical, uint localid) 216 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, Vector3 size, Quaternion rotation)
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)
217 { 222 {
218 PhysicsActor result; 223 PhysicsActor result;
219 IMesh mesh = null; 224 IMesh mesh = null;