aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
diff options
context:
space:
mode:
authorRobert Adams2013-07-06 08:22:59 -0700
committerRobert Adams2013-07-06 08:25:15 -0700
commita65cec3986431f5a2f4f9eb2424157def0d035c8 (patch)
tree5e8ea300f4d9042c52f0cc89367cb0e9dc7e3dee /OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
parentBulletSim: More tweaking on center-of-mass. Almost there. Changes have no eff... (diff)
downloadopensim-SC_OLD-a65cec3986431f5a2f4f9eb2424157def0d035c8.zip
opensim-SC_OLD-a65cec3986431f5a2f4f9eb2424157def0d035c8.tar.gz
opensim-SC_OLD-a65cec3986431f5a2f4f9eb2424157def0d035c8.tar.bz2
opensim-SC_OLD-a65cec3986431f5a2f4f9eb2424157def0d035c8.tar.xz
BulletSim: implementation of linkset center-of-mass.
Default off, for the moment, until more testing. Add separate thread and center-of-mass flags to OpenSimDefaults.ini. Clean up comments in OpenSimDefaults.ini.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs11
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 7058646..1fbcfcc 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -160,10 +160,13 @@ public class BSPrimLinkable : BSPrimDisplaced
160 protected override void MakeDynamic(bool makeStatic) 160 protected override void MakeDynamic(bool makeStatic)
161 { 161 {
162 base.MakeDynamic(makeStatic); 162 base.MakeDynamic(makeStatic);
163 if (makeStatic) 163 if (Linkset != null) // null can happen during initialization
164 Linkset.MakeStatic(this); 164 {
165 else 165 if (makeStatic)
166 Linkset.MakeDynamic(this); 166 Linkset.MakeStatic(this);
167 else
168 Linkset.MakeDynamic(this);
169 }
167 } 170 }
168 171
169 // Body is being taken apart. Remove physical dependencies and schedule a rebuild. 172 // Body is being taken apart. Remove physical dependencies and schedule a rebuild.