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/BSLinkset.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 436e043..4ee047b 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -82,9 +82,9 @@ public abstract class BSLinkset
 
     // Some linksets have a preferred physical shape.
     // Returns SHAPE_UNKNOWN if there is no preference. Causes the correct shape to be selected.
-    public virtual ShapeData.PhysicsShapeType PreferredPhysicalShape(BSPhysObject requestor)
+    public virtual PhysicsShapeType PreferredPhysicalShape(BSPhysObject requestor)
     {
-        return ShapeData.PhysicsShapeType.SHAPE_UNKNOWN;
+        return PhysicsShapeType.SHAPE_UNKNOWN;
     }
 
     // Linksets move around the children so the linkset might need to compute the child position
-- 
cgit v1.1