diff options
| author | Robert Adams | 2012-11-24 19:57:11 -0800 |
|---|---|---|
| committer | Robert Adams | 2012-11-25 20:04:27 -0800 |
| commit | c3f30fef96674e9f43a277399c987a85cec9a7d3 (patch) | |
| tree | 633d47fcc341c04ffbe4f36dce78c42daef2301c /OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | |
| parent | BulletSim: Add tables and initialization for different attributes for differe... (diff) | |
| download | opensim-SC_OLD-c3f30fef96674e9f43a277399c987a85cec9a7d3.zip opensim-SC_OLD-c3f30fef96674e9f43a277399c987a85cec9a7d3.tar.gz opensim-SC_OLD-c3f30fef96674e9f43a277399c987a85cec9a7d3.tar.bz2 opensim-SC_OLD-c3f30fef96674e9f43a277399c987a85cec9a7d3.tar.xz | |
BulletSim: add parameter for terrain collision margin.
Add locking around unlikely but possible race conditions on terrain list.
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 3ca756c..1450f66 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | |||
| @@ -93,7 +93,7 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys | |||
| 93 | { | 93 | { |
| 94 | m_mapInfo.Ptr = BulletSimAPI.CreateHeightMapInfo2(PhysicsScene.World.ptr, m_mapInfo.ID, | 94 | m_mapInfo.Ptr = BulletSimAPI.CreateHeightMapInfo2(PhysicsScene.World.ptr, m_mapInfo.ID, |
| 95 | m_mapInfo.minCoords, m_mapInfo.maxCoords, | 95 | m_mapInfo.minCoords, m_mapInfo.maxCoords, |
| 96 | m_mapInfo.heightMap, BSTerrainManager.TERRAIN_COLLISION_MARGIN); | 96 | m_mapInfo.heightMap, PhysicsScene.Params.terrainCollisionMargin); |
| 97 | 97 | ||
| 98 | // Create the terrain shape from the mapInfo | 98 | // Create the terrain shape from the mapInfo |
| 99 | m_mapInfo.terrainShape = new BulletShape(BulletSimAPI.CreateTerrainShape2(m_mapInfo.Ptr), | 99 | m_mapInfo.terrainShape = new BulletShape(BulletSimAPI.CreateTerrainShape2(m_mapInfo.Ptr), |