diff options
| author | Robert Adams | 2012-08-06 12:55:52 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-08-06 12:55:52 -0700 |
| commit | 4adb3471ac6e7710395a47d77aa8c1b3715a6c99 (patch) | |
| tree | cfc79099004578ee0d4e20bf92361e9e3a26c9fa /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
| parent | Strip experimental tag from --publish option of "save oar" region console com... (diff) | |
| download | opensim-SC_OLD-4adb3471ac6e7710395a47d77aa8c1b3715a6c99.zip opensim-SC_OLD-4adb3471ac6e7710395a47d77aa8c1b3715a6c99.tar.gz opensim-SC_OLD-4adb3471ac6e7710395a47d77aa8c1b3715a6c99.tar.bz2 opensim-SC_OLD-4adb3471ac6e7710395a47d77aa8c1b3715a6c99.tar.xz | |
BulletSim: update SOs and DLLs to run on more Linux versions. Correct multiple buoyancy settings when character flying. Remove chatty log message on prim destruction.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index 494f5a6..ee485b4 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
| @@ -274,9 +274,12 @@ public class BSCharacter : PhysicsActor | |||
| 274 | public override bool Flying { | 274 | public override bool Flying { |
| 275 | get { return _flying; } | 275 | get { return _flying; } |
| 276 | set { | 276 | set { |
| 277 | _flying = value; | 277 | if (_flying != value) |
| 278 | // simulate flying by changing the effect of gravity | 278 | { |
| 279 | this.Buoyancy = ComputeBuoyancyFromFlying(_flying); | 279 | _flying = value; |
| 280 | // simulate flying by changing the effect of gravity | ||
| 281 | this.Buoyancy = ComputeBuoyancyFromFlying(_flying); | ||
| 282 | } | ||
| 280 | } | 283 | } |
| 281 | } | 284 | } |
| 282 | private float ComputeBuoyancyFromFlying(bool ifFlying) { | 285 | private float ComputeBuoyancyFromFlying(bool ifFlying) { |