From 39c02dcc8c537d5989238ec97c876e033895a8a9 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 1 Nov 2012 10:23:37 -0700
Subject: BulletSim: Remove use of shapeData in ShapeCollection and rely on the
 available BSPhysObject varaiables. Fix line endings in BSLinksetCompound.

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

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

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 6220b21..7d91468 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -78,6 +78,10 @@ public abstract class BSPhysObject : PhysicsActor
 
     // The objects base shape information. Null if not a prim type shape.
     public PrimitiveBaseShape BaseShape { get; protected set; }
+    // Some types of objects have preferred physical representations.
+    // Returns SHAPE_UNKNOWN if there is no preference.
+    public virtual ShapeData.PhysicsShapeType PreferredPhysicalShape
+        { get { return ShapeData.PhysicsShapeType.SHAPE_UNKNOWN; } }
 
     // When the physical properties are updated, an EntityProperty holds the update values.
     // Keep the current and last EntityProperties to enable computation of differences
-- 
cgit v1.1