diff options
| author | Robert Adams | 2012-10-19 10:48:45 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-10-19 10:52:31 -0700 |
| commit | f422b9b388fe67c61e610c79efabd5e07512884b (patch) | |
| tree | 7ad1c226e8541742164e83cf18e8baf595061367 /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |
| parent | BulletSim: change nonimal physics frame rate to 55 to give same numbers as ODE. (diff) | |
| download | opensim-SC_OLD-f422b9b388fe67c61e610c79efabd5e07512884b.zip opensim-SC_OLD-f422b9b388fe67c61e610c79efabd5e07512884b.tar.gz opensim-SC_OLD-f422b9b388fe67c61e610c79efabd5e07512884b.tar.bz2 opensim-SC_OLD-f422b9b388fe67c61e610c79efabd5e07512884b.tar.xz | |
BulletSim: reorder avatar collision checking to eliminate double collision_end.
Various tweekings to avatar shape/mass/inertia/etc.
Remove change from avatar radius to diameter. But still the avatar sinks.
Collision_end now happens immediately rather than at the next subscription time.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index 24d8db6..5ffd591 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
| @@ -390,7 +390,7 @@ public enum CollisionFilterGroups : uint | |||
| 390 | VolumeDetectMask = ~BSensorTrigger, | 390 | VolumeDetectMask = ~BSensorTrigger, |
| 391 | TerrainFilter = BTerrainFilter, | 391 | TerrainFilter = BTerrainFilter, |
| 392 | TerrainMask = BAllFilter & ~BStaticFilter, | 392 | TerrainMask = BAllFilter & ~BStaticFilter, |
| 393 | GroundPlaneFilter = BAllFilter, | 393 | GroundPlaneFilter = BGroundPlaneFilter, |
| 394 | GroundPlaneMask = BAllFilter | 394 | GroundPlaneMask = BAllFilter |
| 395 | 395 | ||
| 396 | }; | 396 | }; |