diff options
| author | Melanie | 2012-11-22 14:47:57 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-22 14:47:57 +0000 |
| commit | 2bdd3eb918cede60290905974ea26d2bbd7d5187 (patch) | |
| tree | f492abae6df9a63505ecf7703932562bd1c0f457 /OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because it (diff) | |
| download | opensim-SC-2bdd3eb918cede60290905974ea26d2bbd7d5187.zip opensim-SC-2bdd3eb918cede60290905974ea26d2bbd7d5187.tar.gz opensim-SC-2bdd3eb918cede60290905974ea26d2bbd7d5187.tar.bz2 opensim-SC-2bdd3eb918cede60290905974ea26d2bbd7d5187.tar.xz | |
Merge branch 'master' into careminster
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 8fc36d1..3ca756c 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | |||
| @@ -97,7 +97,7 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys | |||
| 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), |
| 100 | PhysicsShapeType.SHAPE_TERRAIN); | 100 | BSPhysicsShapeType.SHAPE_TERRAIN); |
| 101 | 101 | ||
| 102 | // The terrain object initial position is at the center of the object | 102 | // The terrain object initial position is at the center of the object |
| 103 | Vector3 centerPos; | 103 | Vector3 centerPos; |