aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
diff options
context:
space:
mode:
authorRobert Adams2013-08-06 10:32:56 -0700
committerRobert Adams2013-09-11 09:11:34 -0700
commit725751fd6c0101b8610e84716d28b6af91e20b61 (patch)
treec43b6528c292e5991d4cf44741cf9702b3ab75e5 /OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
parentchaning the default max_distance to 16383 as we actually start counting at ze... (diff)
downloadopensim-SC_OLD-725751fd6c0101b8610e84716d28b6af91e20b61.zip
opensim-SC_OLD-725751fd6c0101b8610e84716d28b6af91e20b61.tar.gz
opensim-SC_OLD-725751fd6c0101b8610e84716d28b6af91e20b61.tar.bz2
opensim-SC_OLD-725751fd6c0101b8610e84716d28b6af91e20b61.tar.xz
BulletSim: fixes for change linkset implementation of physical linksets.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 3afd52e..a051002 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -148,7 +148,7 @@ public abstract class BSLinkset
148 // Returns a new linkset for the child which is a linkset of one (just the 148 // Returns a new linkset for the child which is a linkset of one (just the
149 // orphened child). 149 // orphened child).
150 // Called at runtime. 150 // Called at runtime.
151 public BSLinkset RemoveMeFromLinkset(BSPrimLinkable child) 151 public BSLinkset RemoveMeFromLinkset(BSPrimLinkable child, bool inTaintTime)
152 { 152 {
153 lock (m_linksetActivityLock) 153 lock (m_linksetActivityLock)
154 { 154 {
@@ -157,7 +157,7 @@ public abstract class BSLinkset
157 // Cannot remove the root from a linkset. 157 // Cannot remove the root from a linkset.
158 return this; 158 return this;
159 } 159 }
160 RemoveChildFromLinkset(child); 160 RemoveChildFromLinkset(child, inTaintTime);
161 LinksetMass = ComputeLinksetMass(); 161 LinksetMass = ComputeLinksetMass();
162 } 162 }
163 163
@@ -255,7 +255,7 @@ public abstract class BSLinkset
255 255
256 // I am the root of a linkset and one of my children is being removed. 256 // I am the root of a linkset and one of my children is being removed.
257 // Safe to call even if the child is not really in my linkset. 257 // Safe to call even if the child is not really in my linkset.
258 protected abstract void RemoveChildFromLinkset(BSPrimLinkable child); 258 protected abstract void RemoveChildFromLinkset(BSPrimLinkable child, bool inTaintTime);
259 259
260 // When physical properties are changed the linkset needs to recalculate 260 // When physical properties are changed the linkset needs to recalculate
261 // its internal properties. 261 // its internal properties.