aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
diff options
context:
space:
mode:
authorRobert Adams2013-02-12 15:45:44 -0800
committerRobert Adams2013-02-12 15:52:10 -0800
commit0194a3d890b95c8a29fcdf130c378e3a8a629c77 (patch)
treedf1d9993266ab8460809fb8c901e7f08d7b3bdba /OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
parentBulletSim: More work on center-of-mass. Remove linksetinfo and rely on simula... (diff)
downloadopensim-SC_OLD-0194a3d890b95c8a29fcdf130c378e3a8a629c77.zip
opensim-SC_OLD-0194a3d890b95c8a29fcdf130c378e3a8a629c77.tar.gz
opensim-SC_OLD-0194a3d890b95c8a29fcdf130c378e3a8a629c77.tar.bz2
opensim-SC_OLD-0194a3d890b95c8a29fcdf130c378e3a8a629c77.tar.xz
BulletSim: fix density since the simulator/viewer track density in a
funny unit that is 100 times real density (default 1000). Fix avatar drifting slowly when stationary flying. Fix for physical prims getting corrected for being under terrain when it was just its geometric center that was below terrain. Add PreUpdatePropertyAction allowing plugable modifiction of phys parameters returned from Bullet. Fix an exception setting GravityMultiplier on initialization. Update DLLs and SOs for good measure (no functional change).
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index 96f9762..d65d407 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -135,7 +135,8 @@ public class BSPrimLinkable : BSPrimDisplaced
135 // When going from non-physical to physical, this re-enables the constraints that 135 // When going from non-physical to physical, this re-enables the constraints that
136 // had been automatically disabled when the mass was set to zero. 136 // had been automatically disabled when the mass was set to zero.
137 // For compound based linksets, this enables and disables interactions of the children. 137 // For compound based linksets, this enables and disables interactions of the children.
138 Linkset.Refresh(this); 138 if (Linkset != null) // null can happen during initialization
139 Linkset.Refresh(this);
139 } 140 }
140 141
141 protected override void MakeDynamic(bool makeStatic) 142 protected override void MakeDynamic(bool makeStatic)