diff options
| author | Teravus Ovares | 2009-04-16 08:11:05 +0000 |
|---|---|---|
| committer | Teravus Ovares | 2009-04-16 08:11:05 +0000 |
| commit | 8a7a0190e69b466217a9c4cb6eb57abc1f5629ee (patch) | |
| tree | 6c5b274158af3b89620e2fcdb33513abde9f4ba4 /OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs | |
| parent | * Committing more BulletDotNETPlugin work (diff) | |
| download | opensim-SC-8a7a0190e69b466217a9c4cb6eb57abc1f5629ee.zip opensim-SC-8a7a0190e69b466217a9c4cb6eb57abc1f5629ee.tar.gz opensim-SC-8a7a0190e69b466217a9c4cb6eb57abc1f5629ee.tar.bz2 opensim-SC-8a7a0190e69b466217a9c4cb6eb57abc1f5629ee.tar.xz | |
* Remove some super experimental stuff in BulletDotNETPlugin since it was causing issues.
* Tweak the ODEPrim PID a bit more.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs index 5ff73c5..ec982c6 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs | |||
| @@ -2140,8 +2140,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
| 2140 | ((btGImpactMeshShape) prim_geom).setLocalScaling(new btVector3(1, 1, 1)); | 2140 | ((btGImpactMeshShape) prim_geom).setLocalScaling(new btVector3(1, 1, 1)); |
| 2141 | ((btGImpactMeshShape) prim_geom).updateBound(); | 2141 | ((btGImpactMeshShape) prim_geom).updateBound(); |
| 2142 | } | 2142 | } |
| 2143 | Body.setCollisionFlags(Body.getCollisionFlags() | (int)ContactFlags.CF_CUSTOM_MATERIAL_CALLBACK); | 2143 | //Body.setCollisionFlags(Body.getCollisionFlags() | (int)ContactFlags.CF_CUSTOM_MATERIAL_CALLBACK); |
| 2144 | Body.setUserPointer((IntPtr) m_localID); | 2144 | //Body.setUserPointer((IntPtr) (int)m_localID); |
| 2145 | _parent_scene.AddPrimToScene(this); | 2145 | _parent_scene.AddPrimToScene(this); |
| 2146 | } | 2146 | } |
| 2147 | else | 2147 | else |