diff options
| author | Melanie | 2012-12-28 08:32:34 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-28 08:32:34 +0000 |
| commit | 3ab1bd04031ca0bc1039e4e1d267ea19d0017430 (patch) | |
| tree | 3f2417f3b96e151642158d29d1982dee2bd850a8 /OpenSim/Region/Physics/BulletSNPlugin/BSDynamics.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: correct collision mask definition for linkset children. (diff) | |
| download | opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.zip opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.gz opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.bz2 opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Physics/BulletSNPlugin/BSDynamics.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSNPlugin/BSDynamics.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSNPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSNPlugin/BSDynamics.cs index 72afacc..415ad4f 100644 --- a/OpenSim/Region/Physics/BulletSNPlugin/BSDynamics.cs +++ b/OpenSim/Region/Physics/BulletSNPlugin/BSDynamics.cs | |||
| @@ -573,6 +573,9 @@ namespace OpenSim.Region.Physics.BulletSNPlugin | |||
| 573 | BulletSimAPI.SetMassProps2(Prim.PhysBody.ptr, m_vehicleMass, localInertia); | 573 | BulletSimAPI.SetMassProps2(Prim.PhysBody.ptr, m_vehicleMass, localInertia); |
| 574 | BulletSimAPI.UpdateInertiaTensor2(Prim.PhysBody.ptr); | 574 | BulletSimAPI.UpdateInertiaTensor2(Prim.PhysBody.ptr); |
| 575 | 575 | ||
| 576 | Vector3 grav = PhysicsScene.DefaultGravity * (1f - Prim.Buoyancy); | ||
| 577 | BulletSimAPI.SetGravity2(Prim.PhysBody.ptr, grav); | ||
| 578 | |||
| 576 | VDetailLog("{0},BSDynamics.Refresh,mass={1},frict={2},inert={3},aDamp={4}", | 579 | VDetailLog("{0},BSDynamics.Refresh,mass={1},frict={2},inert={3},aDamp={4}", |
| 577 | Prim.LocalID, m_vehicleMass, friction, localInertia, angularDamping); | 580 | Prim.LocalID, m_vehicleMass, friction, localInertia, angularDamping); |
| 578 | } | 581 | } |