diff options
author | Robert Adams | 2012-03-21 07:07:44 -0700 |
---|---|---|
committer | Robert Adams | 2012-03-23 13:15:18 -0700 |
commit | 1a738caecab74c5b9f6b6bac69a3ea9ccdc80b24 (patch) | |
tree | a8c4f41ae006784d6944047d62eaf82442116db8 /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
parent | BulletSim: Add AvatarRestitution parameter. Centralize computation of buoyanc... (diff) | |
download | opensim-SC-1a738caecab74c5b9f6b6bac69a3ea9ccdc80b24.zip opensim-SC-1a738caecab74c5b9f6b6bac69a3ea9ccdc80b24.tar.gz opensim-SC-1a738caecab74c5b9f6b6bac69a3ea9ccdc80b24.tar.bz2 opensim-SC-1a738caecab74c5b9f6b6bac69a3ea9ccdc80b24.tar.xz |
BulletSim: update TODO list. Rearrange code for readability. Add per object friction and restitution runtime settable parameters.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index 1a61431..20708d9 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
@@ -261,7 +261,7 @@ public class BSCharacter : PhysicsActor | |||
261 | set { | 261 | set { |
262 | _flying = value; | 262 | _flying = value; |
263 | // simulate flying by changing the effect of gravity | 263 | // simulate flying by changing the effect of gravity |
264 | this.Buoyancy(ComputeBuoyancyFromFlying(_flying)); | 264 | this.Buoyancy = ComputeBuoyancyFromFlying(_flying); |
265 | } | 265 | } |
266 | } | 266 | } |
267 | private float ComputeBuoyancyFromFlying(bool ifFlying) { | 267 | private float ComputeBuoyancyFromFlying(bool ifFlying) { |
@@ -356,7 +356,7 @@ public class BSCharacter : PhysicsActor | |||
356 | } | 356 | } |
357 | else | 357 | else |
358 | { | 358 | { |
359 | m_log.WarnFormat("{0}: Got a NaN force applied to a Character", LogHeader); | 359 | m_log.ErrorFormat("{0}: Got a NaN force applied to a Character", LogHeader); |
360 | } | 360 | } |
361 | //m_lastUpdateSent = false; | 361 | //m_lastUpdateSent = false; |
362 | } | 362 | } |