diff options
| author | Robert Adams | 2012-11-03 21:08:39 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-11-03 21:16:02 -0700 |
| commit | 79f7c466a116bf368423d4e18163f34fd8d66ce1 (patch) | |
| tree | 8acd97fa89b1d900f785cec052fedfac7dde6027 /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
| parent | BulletSim: search the mesh and hull lists to find shapes if type is not known... (diff) | |
| download | opensim-SC_OLD-79f7c466a116bf368423d4e18163f34fd8d66ce1.zip opensim-SC_OLD-79f7c466a116bf368423d4e18163f34fd8d66ce1.tar.gz opensim-SC_OLD-79f7c466a116bf368423d4e18163f34fd8d66ce1.tar.bz2 opensim-SC_OLD-79f7c466a116bf368423d4e18163f34fd8d66ce1.tar.xz | |
BulletSim: fix compound linkset crash by not freeing shape of child prims.
Remove all compilation warnings (mostly 'protected' in sealed classes.)
Add the dynamicAabbEnable parameter to creation of compound shapes.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index af403aa..aaa0d93 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
| @@ -703,6 +703,9 @@ public sealed class BSPrim : BSPhysObject | |||
| 703 | // For good measure, make sure the transform is set through to the motion state | 703 | // For good measure, make sure the transform is set through to the motion state |
| 704 | BulletSimAPI.SetTranslation2(PhysBody.ptr, _position, _orientation); | 704 | BulletSimAPI.SetTranslation2(PhysBody.ptr, _position, _orientation); |
| 705 | 705 | ||
| 706 | // Center of mass is at the center of the object | ||
| 707 | BulletSimAPI.SetCenterOfMassByPosRot2(Linkset.LinksetRoot.PhysBody.ptr, _position, _orientation); | ||
| 708 | |||
| 706 | // A dynamic object has mass | 709 | // A dynamic object has mass |
| 707 | UpdatePhysicalMassProperties(RawMass); | 710 | UpdatePhysicalMassProperties(RawMass); |
| 708 | 711 | ||