diff options
| author | Robert Adams | 2012-09-27 08:23:29 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-09-27 22:01:52 -0700 |
| commit | f82b903deeaaf8eaa7ae5c4d4b7e917dd0a6ce7b (patch) | |
| tree | 3d355254a7bcb8c447fbfef901784af7062763d4 /OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | |
| parent | BulletSim: Terrain sets proper collision flags on creation. (diff) | |
| download | opensim-SC-f82b903deeaaf8eaa7ae5c4d4b7e917dd0a6ce7b.zip opensim-SC-f82b903deeaaf8eaa7ae5c4d4b7e917dd0a6ce7b.tar.gz opensim-SC-f82b903deeaaf8eaa7ae5c4d4b7e917dd0a6ce7b.tar.bz2 opensim-SC-f82b903deeaaf8eaa7ae5c4d4b7e917dd0a6ce7b.tar.xz | |
BulletSim: Fix linkset crash. Caused by the different body and shape
pointers at runtime and at taint-time. Now passes the body into the
taint.
Vehicles zero inertia when active to eliminate Bullet's contribution
to vehicle motion.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs index 50638d6..269c3d5 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | |||
| @@ -334,7 +334,8 @@ public class BSTerrainManager | |||
| 334 | (uint)CollisionFilterGroups.TerrainMask); | 334 | (uint)CollisionFilterGroups.TerrainMask); |
| 335 | 335 | ||
| 336 | // Make sure the new shape is processed. | 336 | // Make sure the new shape is processed. |
| 337 | BulletSimAPI.Activate2(mapInfo.terrainBody.ptr, true); | 337 | // BulletSimAPI.Activate2(mapInfo.terrainBody.ptr, true); |
| 338 | BulletSimAPI.ForceActivationState2(mapInfo.terrainBody.ptr, ActivationState.DISABLE_SIMULATION); | ||
| 338 | 339 | ||
| 339 | m_terrainModified = true; | 340 | m_terrainModified = true; |
| 340 | }; | 341 | }; |