From d6db0d5740dae03174f65846556f2f06d573b5c4 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 20 Nov 2012 11:24:25 -0800
Subject: BulletSim: uplevel PhysicsShapeType out of ShapeData structure (since
 it is getting simplified out of existance someday) and update all the
 references to that enum.

---
 OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
index 7c34af2..cc28e4d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
@@ -109,7 +109,7 @@ public sealed class BSTerrainManager
         // The ground plane is here to catch things that are trying to drop to negative infinity
         BulletShape groundPlaneShape = new BulletShape(
                     BulletSimAPI.CreateGroundPlaneShape2(BSScene.GROUNDPLANE_ID, 1f, TERRAIN_COLLISION_MARGIN),
-                    ShapeData.PhysicsShapeType.SHAPE_GROUNDPLANE);
+                    PhysicsShapeType.SHAPE_GROUNDPLANE);
         m_groundPlane = new BulletBody(BSScene.GROUNDPLANE_ID,
                         BulletSimAPI.CreateBodyWithDefaultMotionState2(groundPlaneShape.ptr, BSScene.GROUNDPLANE_ID,
                                                             Vector3.Zero, Quaternion.Identity));
@@ -299,7 +299,7 @@ public sealed class BSTerrainManager
 
                     // Create the terrain shape from the mapInfo
                     mapInfo.terrainShape = new BulletShape(BulletSimAPI.CreateTerrainShape2(mapInfo.Ptr),
-                                ShapeData.PhysicsShapeType.SHAPE_TERRAIN);
+                                PhysicsShapeType.SHAPE_TERRAIN);
 
                     // The terrain object initial position is at the center of the object
                     Vector3 centerPos;
-- 
cgit v1.1