aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
diff options
context:
space:
mode:
authorRobert Adams2012-10-22 16:33:21 -0700
committerRobert Adams2012-10-22 22:24:59 -0700
commit14eeb8b31b865f7b1927703028b03b6f61693cb6 (patch)
tree3139a56a535d1919a8cb4b6d93a66e3100866c51 /OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
parentBulletSim: fix problem of not rebuilding shape by clearing last rebuild faile... (diff)
downloadopensim-SC_OLD-14eeb8b31b865f7b1927703028b03b6f61693cb6.zip
opensim-SC_OLD-14eeb8b31b865f7b1927703028b03b6f61693cb6.tar.gz
opensim-SC_OLD-14eeb8b31b865f7b1927703028b03b6f61693cb6.tar.bz2
opensim-SC_OLD-14eeb8b31b865f7b1927703028b03b6f61693cb6.tar.xz
BulletSim: fix bug that caused error (and a crash on 32 bit Linux) when mesh assets weren't already in the cache. Comment cleanups.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs19
1 files changed, 4 insertions, 15 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index 8eeeb73..8a750b5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -46,9 +46,8 @@ public class BSLinksetConstraints : BSLinkset
46 // May be called at runtime or taint-time (just pass the appropriate flag). 46 // May be called at runtime or taint-time (just pass the appropriate flag).
47 public override void Refresh(BSPhysObject requestor, bool inTaintTime) 47 public override void Refresh(BSPhysObject requestor, bool inTaintTime)
48 { 48 {
49 // If there are no children, not physical or not root, I am not the one that recomputes the constraints 49 // If there are no children or not root, I am not the one that recomputes the constraints
50 // (For the moment, static linksets do create constraints so remove the test for physical.) 50 if (!HasAnyChildren || !IsRoot(requestor))
51 if (!HasAnyChildren || /*!requestor.IsPhysical ||*/ !IsRoot(requestor))
52 return; 51 return;
53 52
54 BSScene.TaintCallback refreshOperation = delegate() 53 BSScene.TaintCallback refreshOperation = delegate()
@@ -85,20 +84,10 @@ public class BSLinksetConstraints : BSLinkset
85 return false; 84 return false;
86 } 85 }
87 86
88 // If the software is handling the movement of all the objects in a linkset
89 // (like if one doesn't use constraints for static linksets), this is called
90 // when an update for the root of the linkset is received.
91 // Called at taint-time!! 87 // Called at taint-time!!
92 public override void UpdateProperties(BSPhysObject physObject) 88 public override void UpdateProperties(BSPhysObject updated)
93 { 89 {
94 // The root local properties have been updated. Apply to the children if appropriate. 90 // Nothing to do for constraints on property updates
95 if (IsRoot(physObject) && HasAnyChildren)
96 {
97 if (!physObject.IsPhysical)
98 {
99 // TODO: implement software linkset update for static object linksets
100 }
101 }
102 } 91 }
103 92
104 // Routine used when rebuilding the body of the root of the linkset 93 // Routine used when rebuilding the body of the root of the linkset