diff options
| author | Robert Adams | 2012-12-30 14:26:57 -0800 |
|---|---|---|
| committer | Robert Adams | 2012-12-31 19:57:23 -0800 |
| commit | c2a7af18b639646b647eb4cdff4168a2b9746ee4 (patch) | |
| tree | afe36195792b9990f7defd18bc29791f7527dcff /OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | |
| parent | BulletSim: remove all the debug printing of pointer formatting (.ToString(X))... (diff) | |
| download | opensim-SC_OLD-c2a7af18b639646b647eb4cdff4168a2b9746ee4.zip opensim-SC_OLD-c2a7af18b639646b647eb4cdff4168a2b9746ee4.tar.gz opensim-SC_OLD-c2a7af18b639646b647eb4cdff4168a2b9746ee4.tar.bz2 opensim-SC_OLD-c2a7af18b639646b647eb4cdff4168a2b9746ee4.tar.xz | |
BulletSim: nearly complete in conversion from BulletSimAPI to BSAPITemplate. Only initialization and debug fuctions left.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs index 01966c0..cc28344 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | |||
| @@ -120,7 +120,7 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys | |||
| 120 | PhysicsScene.PE.UpdateSingleAabb(PhysicsScene.World, m_mapInfo.terrainBody); | 120 | PhysicsScene.PE.UpdateSingleAabb(PhysicsScene.World, m_mapInfo.terrainBody); |
| 121 | 121 | ||
| 122 | m_mapInfo.terrainBody.collisionType = CollisionType.Terrain; | 122 | m_mapInfo.terrainBody.collisionType = CollisionType.Terrain; |
| 123 | m_mapInfo.terrainBody.ApplyCollisionMask(); | 123 | m_mapInfo.terrainBody.ApplyCollisionMask(PhysicsScene); |
| 124 | 124 | ||
| 125 | // Make it so the terrain will not move or be considered for movement. | 125 | // Make it so the terrain will not move or be considered for movement. |
| 126 | PhysicsScene.PE.ForceActivationState(m_mapInfo.terrainBody, ActivationState.DISABLE_SIMULATION); | 126 | PhysicsScene.PE.ForceActivationState(m_mapInfo.terrainBody, ActivationState.DISABLE_SIMULATION); |