diff options
| author | Melanie | 2012-08-07 20:20:28 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-07 20:20:28 +0100 |
| commit | 85b4eab0058982dc09697362ff1f69d2786cd42b (patch) | |
| tree | c5dfc3765c9fd20afcdccb7f87001c3248d11a6d /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: update SOs and DLLs to run on more Linux versions. Correct multipl... (diff) | |
| download | opensim-SC-85b4eab0058982dc09697362ff1f69d2786cd42b.zip opensim-SC-85b4eab0058982dc09697362ff1f69d2786cd42b.tar.gz opensim-SC-85b4eab0058982dc09697362ff1f69d2786cd42b.tar.bz2 opensim-SC-85b4eab0058982dc09697362ff1f69d2786cd42b.tar.xz | |
Merge branch 'master' into careminster
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) { |