From ce812c88ccc9226167b049e49296892943409e3f Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 26 Jul 2012 15:24:53 -0700
Subject: BulletSim: fix a recursive loop when fetching the mass of the root of
 a linkset.

---
 OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | 6 +++---
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index a1027ee..3bc2100 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -50,7 +50,7 @@ public class BSLinkset
 
     // We keep the prim's mass in the linkset structure since it could be dependent on other prims
     private float m_mass;
-    public float Mass 
+    public float LinksetMass 
     { 
         get 
         {
@@ -150,10 +150,10 @@ public class BSLinkset
 
     private float ComputeLinksetMass()
     {
-        float mass = m_linksetRoot.Mass;
+        float mass = m_linksetRoot.MassRaw;
         foreach (BSPrim bp in m_children)
         {
-            mass += bp.Mass;
+            mass += bp.MassRaw;
         }
         return mass;
     }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index d604f9c..7590d93 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -289,7 +289,7 @@ public sealed class BSPrim : PhysicsActor
     { 
         get
         {
-            return _linkset.Mass;
+            return _linkset.LinksetMass;
         }
     }
 
-- 
cgit v1.1