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 | |
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 'OpenSim')
-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); |