diff options
author | Justin Clark-Casey (justincc) | 2013-02-08 02:01:17 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-02-08 02:01:17 +0000 |
commit | e836da5d202df82375d1b1eb55fbf6af76ad88fe (patch) | |
tree | 7abc0514e7f0f8aa0bc47ee35b598a740876a444 /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
parent | Refine TestJsonReadNotecard() and use / instead of . to separate paths. (diff) | |
parent | BulletSim: Adapt BulletSim to the newer physical properties. Viewer (diff) | |
download | opensim-SC-e836da5d202df82375d1b1eb55fbf6af76ad88fe.zip opensim-SC-e836da5d202df82375d1b1eb55fbf6af76ad88fe.tar.gz opensim-SC-e836da5d202df82375d1b1eb55fbf6af76ad88fe.tar.bz2 opensim-SC-e836da5d202df82375d1b1eb55fbf6af76ad88fe.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index 192bcb5..d694a6a 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
@@ -749,9 +749,10 @@ public sealed class BSCharacter : BSPhysObject | |||
749 | _buoyancy = value; | 749 | _buoyancy = value; |
750 | DetailLog("{0},BSCharacter.setForceBuoyancy,taint,buoy={1}", LocalID, _buoyancy); | 750 | DetailLog("{0},BSCharacter.setForceBuoyancy,taint,buoy={1}", LocalID, _buoyancy); |
751 | // Buoyancy is faked by changing the gravity applied to the object | 751 | // Buoyancy is faked by changing the gravity applied to the object |
752 | float grav = PhysicsScene.Params.gravity * (1f - _buoyancy); | 752 | float grav = BSParam.Gravity * (1f - _buoyancy); |
753 | Gravity = new OMV.Vector3(0f, 0f, grav); | ||
753 | if (PhysBody.HasPhysicalBody) | 754 | if (PhysBody.HasPhysicalBody) |
754 | PhysicsScene.PE.SetGravity(PhysBody, new OMV.Vector3(0f, 0f, grav)); | 755 | PhysicsScene.PE.SetGravity(PhysBody, Gravity); |
755 | } | 756 | } |
756 | } | 757 | } |
757 | 758 | ||