Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because it

conflicts with PhysicsShape type defined in later libOMV

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
 
         // Create the terrain shape from the mapInfo
         m_mapInfo.terrainShape = new BulletShape(BulletSimAPI.CreateTerrainShape2(m_mapInfo.Ptr),
-                                                    PhysicsShapeType.SHAPE_TERRAIN);
+                                                    BSPhysicsShapeType.SHAPE_TERRAIN);
 
         // The terrain object initial position is at the center of the object
         Vector3 centerPos;