diff options
| author | Robert Adams | 2013-02-10 09:51:34 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-02-12 15:52:08 -0800 |
| commit | fb903ff49089d5fd7a56aa2401528c3e7cf1800c (patch) | |
| tree | 2e6e28f88e6b7711165a8a315e3796241c4a11d2 /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
| parent | Extend TestJsonCreateStore() with a one key input and an input with raw numbe... (diff) | |
| download | opensim-SC-fb903ff49089d5fd7a56aa2401528c3e7cf1800c.zip opensim-SC-fb903ff49089d5fd7a56aa2401528c3e7cf1800c.tar.gz opensim-SC-fb903ff49089d5fd7a56aa2401528c3e7cf1800c.tar.bz2 opensim-SC-fb903ff49089d5fd7a56aa2401528c3e7cf1800c.tar.xz | |
BulletSim: More work on center-of-mass. Remove linksetinfo and rely on simulator to update info.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index f781aea..04fb05b 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
| @@ -274,7 +274,7 @@ public sealed class BSCharacter : BSPhysObject | |||
| 274 | // This test is done if moving forward, not flying and is colliding with something. | 274 | // This test is done if moving forward, not flying and is colliding with something. |
| 275 | // DetailLog("{0},BSCharacter.WalkUpStairs,IsColliding={1},flying={2},targSpeed={3},collisions={4}", | 275 | // DetailLog("{0},BSCharacter.WalkUpStairs,IsColliding={1},flying={2},targSpeed={3},collisions={4}", |
| 276 | // LocalID, IsColliding, Flying, TargetSpeed, CollisionsLastTick.Count); | 276 | // LocalID, IsColliding, Flying, TargetSpeed, CollisionsLastTick.Count); |
| 277 | if (IsColliding && !Flying && TargetSpeed > 0.1f /* && ForwardSpeed < 0.1f */) | 277 | if (IsColliding && !Flying && TargetVelocitySpeed > 0.1f /* && ForwardSpeed < 0.1f */) |
| 278 | { | 278 | { |
| 279 | // The range near the character's feet where we will consider stairs | 279 | // The range near the character's feet where we will consider stairs |
| 280 | float nearFeetHeightMin = RawPosition.Z - (Size.Z / 2f) + 0.05f; | 280 | float nearFeetHeightMin = RawPosition.Z - (Size.Z / 2f) + 0.05f; |