diff options
| author | BlueWall | 2012-11-26 06:55:03 -0500 |
|---|---|---|
| committer | BlueWall | 2012-11-26 06:55:03 -0500 |
| commit | 88f2fbc8f165121fc63328aec60963a25d07082f (patch) | |
| tree | 459d9986d18f002415c4694a6db7c3ac1efb237e /OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | BulletSim: use m_angularMotor to do the basic movement. Add the setting of sa... (diff) | |
| download | opensim-SC-88f2fbc8f165121fc63328aec60963a25d07082f.zip opensim-SC-88f2fbc8f165121fc63328aec60963a25d07082f.tar.gz opensim-SC-88f2fbc8f165121fc63328aec60963a25d07082f.tar.bz2 opensim-SC-88f2fbc8f165121fc63328aec60963a25d07082f.tar.xz | |
Merge branch 'master' into connector_plugin
Diffstat (limited to '')
| -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), |