diff options
| author | Robert Adams | 2012-10-11 12:54:27 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-10-11 14:01:29 -0700 |
| commit | b24190ec98f31f1e4672d1174163426b9b44e25d (patch) | |
| tree | 1e720ac978101d05c0361d7b65171d6cae1c9b9c /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
| parent | BulletSim: normalize physics FPS to 45 (for real this time). (diff) | |
| download | opensim-SC-b24190ec98f31f1e4672d1174163426b9b44e25d.zip opensim-SC-b24190ec98f31f1e4672d1174163426b9b44e25d.tar.gz opensim-SC-b24190ec98f31f1e4672d1174163426b9b44e25d.tar.bz2 opensim-SC-b24190ec98f31f1e4672d1174163426b9b44e25d.tar.xz | |
BulletSim: remove some unused API2 calls because they were removed from Bullet 2.81
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index 692713d..6a4365c 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
| @@ -673,8 +673,8 @@ public sealed class BSPrim : BSPhysObject | |||
| 673 | 673 | ||
| 674 | // Force activation of the object so Bullet will act on it. | 674 | // Force activation of the object so Bullet will act on it. |
| 675 | // Must do the ForceActivationState2() to overcome the DISABLE_SIMULATION from static objects. | 675 | // Must do the ForceActivationState2() to overcome the DISABLE_SIMULATION from static objects. |
| 676 | BulletSimAPI.ForceActivationState2(BSBody.ptr, ActivationState.ISLAND_SLEEPING); | 676 | BulletSimAPI.ForceActivationState2(BSBody.ptr, ActivationState.ACTIVE_TAG); |
| 677 | BulletSimAPI.Activate2(BSBody.ptr, true); | 677 | // BulletSimAPI.Activate2(BSBody.ptr, true); |
| 678 | 678 | ||
| 679 | BSBody.collisionFilter = CollisionFilterGroups.ObjectFilter; | 679 | BSBody.collisionFilter = CollisionFilterGroups.ObjectFilter; |
| 680 | BSBody.collisionMask = CollisionFilterGroups.ObjectMask; | 680 | BSBody.collisionMask = CollisionFilterGroups.ObjectMask; |