diff options
| author | Melanie | 2013-01-24 00:27:00 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-24 00:27:00 +0000 |
| commit | 2ce4a758e2e790dc2f433dced7ff90d469430441 (patch) | |
| tree | 23f65b0a407969480a518ed2e344b9698a70aec5 /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Disable the not very useful infinite recursion co-op termination tests for no... (diff) | |
| download | opensim-SC-2ce4a758e2e790dc2f433dced7ff90d469430441.zip opensim-SC-2ce4a758e2e790dc2f433dced7ff90d469430441.tar.gz opensim-SC-2ce4a758e2e790dc2f433dced7ff90d469430441.tar.bz2 opensim-SC-2ce4a758e2e790dc2f433dced7ff90d469430441.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 34fd2a0..35dba9b 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
| @@ -557,8 +557,9 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
| 557 | uint cB = m_collisionArray[ii].bID; | 557 | uint cB = m_collisionArray[ii].bID; |
| 558 | Vector3 point = m_collisionArray[ii].point; | 558 | Vector3 point = m_collisionArray[ii].point; |
| 559 | Vector3 normal = m_collisionArray[ii].normal; | 559 | Vector3 normal = m_collisionArray[ii].normal; |
| 560 | SendCollision(cA, cB, point, normal, 0.01f); | 560 | float penetration = m_collisionArray[ii].penetration; |
| 561 | SendCollision(cB, cA, point, -normal, 0.01f); | 561 | SendCollision(cA, cB, point, normal, penetration); |
| 562 | SendCollision(cB, cA, point, -normal, penetration); | ||
| 562 | } | 563 | } |
| 563 | } | 564 | } |
| 564 | 565 | ||