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/BSLinksetCompound.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index cb37840..b9c2cf9 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -42,12 +42,12 @@ public sealed class BSLinksetCompound : BSLinkset
     }
 
     // For compound implimented linksets, if there are children, use compound shape for the root.
-    public override PhysicsShapeType PreferredPhysicalShape(BSPhysObject requestor)
+    public override BSPhysicsShapeType PreferredPhysicalShape(BSPhysObject requestor)
     { 
-        PhysicsShapeType ret = PhysicsShapeType.SHAPE_UNKNOWN;
+        BSPhysicsShapeType ret = BSPhysicsShapeType.SHAPE_UNKNOWN;
         if (IsRoot(requestor) && HasAnyChildren)
         {
-            ret = PhysicsShapeType.SHAPE_COMPOUND;
+            ret = BSPhysicsShapeType.SHAPE_COMPOUND;
         }
         // DetailLog("{0},BSLinksetCompound.PreferredPhysicalShape,call,shape={1}", LinksetRoot.LocalID, ret);
         return ret;
-- 
cgit v1.1