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 | |
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 | ||||
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 2 |
2 files changed, 7 insertions, 4 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) { |
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 011033c..7151908 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
@@ -352,7 +352,7 @@ public class BSScene : PhysicsScene, IPhysicsParameters | |||
352 | BSPrim bsprim = prim as BSPrim; | 352 | BSPrim bsprim = prim as BSPrim; |
353 | if (bsprim != null) | 353 | if (bsprim != null) |
354 | { | 354 | { |
355 | m_log.DebugFormat("{0}: RemovePrim. id={1}/{2}", LogHeader, bsprim.Name, bsprim.LocalID); | 355 | // m_log.DebugFormat("{0}: RemovePrim. id={1}/{2}", LogHeader, bsprim.Name, bsprim.LocalID); |
356 | try | 356 | try |
357 | { | 357 | { |
358 | lock (m_prims) m_prims.Remove(bsprim.LocalID); | 358 | lock (m_prims) m_prims.Remove(bsprim.LocalID); |