diff options
| author | Melanie | 2012-11-22 14:45:41 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-22 14:45:41 +0000 |
| commit | 3b2caa63b0ba890555990a88821ee37daa2607b4 (patch) | |
| tree | a1f3c176b4b80330d34bbd6ac18811c5d7299081 /OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs | |
| parent | Factor out command script code. (diff) | |
| download | opensim-SC-3b2caa63b0ba890555990a88821ee37daa2607b4.zip opensim-SC-3b2caa63b0ba890555990a88821ee37daa2607b4.tar.gz opensim-SC-3b2caa63b0ba890555990a88821ee37daa2607b4.tar.bz2 opensim-SC-3b2caa63b0ba890555990a88821ee37daa2607b4.tar.xz | |
Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because it
conflicts with PhysicsShape type defined in later libOMV
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs index 3279b6f..dca7150 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs | |||
| @@ -91,7 +91,7 @@ public sealed class BSTerrainMesh : BSTerrainPhys | |||
| 91 | 91 | ||
| 92 | m_terrainShape = new BulletShape(BulletSimAPI.CreateMeshShape2(PhysicsScene.World.ptr, | 92 | m_terrainShape = new BulletShape(BulletSimAPI.CreateMeshShape2(PhysicsScene.World.ptr, |
| 93 | indicesCount, indices, verticesCount, vertices), | 93 | indicesCount, indices, verticesCount, vertices), |
| 94 | PhysicsShapeType.SHAPE_MESH); | 94 | BSPhysicsShapeType.SHAPE_MESH); |
| 95 | if (m_terrainShape.ptr == IntPtr.Zero) | 95 | if (m_terrainShape.ptr == IntPtr.Zero) |
| 96 | { | 96 | { |
| 97 | // DISASTER!! | 97 | // DISASTER!! |