From 3b2caa63b0ba890555990a88821ee37daa2607b4 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 22 Nov 2012 14:45:41 +0000
Subject: Rename BulletSim's PhysicsShapeType to BSPhysicsShapeType because it
 conflicts with PhysicsShape type defined in later libOMV

---
 OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs')

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;
-- 
cgit v1.1