aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
diff options
context:
space:
mode:
authorRobert Adams2012-11-01 10:23:37 -0700
committerRobert Adams2012-11-03 21:15:14 -0700
commit39c02dcc8c537d5989238ec97c876e033895a8a9 (patch)
treeb23392da13d4ff36ba3258d0239ea928584a6a99 /OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
parentBulletSim: rename BSBody and BSShape to PhysBody and PhysShape. Add skeleton ... (diff)
downloadopensim-SC_OLD-39c02dcc8c537d5989238ec97c876e033895a8a9.zip
opensim-SC_OLD-39c02dcc8c537d5989238ec97c876e033895a8a9.tar.gz
opensim-SC_OLD-39c02dcc8c537d5989238ec97c876e033895a8a9.tar.bz2
opensim-SC_OLD-39c02dcc8c537d5989238ec97c876e033895a8a9.tar.xz
BulletSim: Remove use of shapeData in ShapeCollection and rely on the available BSPhysObject varaiables. Fix line endings in BSLinksetCompound.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 525ec28..f56851f 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -68,6 +68,11 @@ public abstract class BSLinkset
68 // to the physical representation is done via the tainting mechenism. 68 // to the physical representation is done via the tainting mechenism.
69 protected object m_linksetActivityLock = new Object(); 69 protected object m_linksetActivityLock = new Object();
70 70
71 // Some linksets have a preferred physical shape.
72 // Returns SHAPE_UNKNOWN if there is no preference.
73 public virtual ShapeData.PhysicsShapeType PreferredPhysicalShape
74 { get { return ShapeData.PhysicsShapeType.SHAPE_UNKNOWN; } }
75
71 // We keep the prim's mass in the linkset structure since it could be dependent on other prims 76 // We keep the prim's mass in the linkset structure since it could be dependent on other prims
72 protected float m_mass; 77 protected float m_mass;
73 public float LinksetMass 78 public float LinksetMass