diff options
| author | Melanie | 2010-04-29 23:33:20 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-29 23:33:20 +0100 |
| commit | f06772a088e6b1b36c030300ba73dff256ce9087 (patch) | |
| tree | 3744d0a0d688ee8b4b7183ff7cc899f2db785e58 /OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs | |
| parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
| parent | Fix Av jump motion S/W (diff) | |
| download | opensim-SC-f06772a088e6b1b36c030300ba73dff256ce9087.zip opensim-SC-f06772a088e6b1b36c030300ba73dff256ce9087.tar.gz opensim-SC-f06772a088e6b1b36c030300ba73dff256ce9087.tar.bz2 opensim-SC-f06772a088e6b1b36c030300ba73dff256ce9087.tar.xz | |
Merge branch 'careminster' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs index 8e87ad9..7a5093b 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs | |||
| @@ -1025,11 +1025,11 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1025 | // m_iscolliding includes collisions with the ground. | 1025 | // m_iscolliding includes collisions with the ground. |
| 1026 | 1026 | ||
| 1027 | // d.Vector3 pos = d.BodyGetPosition(Body); | 1027 | // d.Vector3 pos = d.BodyGetPosition(Body); |
| 1028 | if (_target_velocity.X > 0) | 1028 | if (Math.Abs(_target_velocity.X) > 0) |
| 1029 | { | 1029 | { |
| 1030 | vec.X = ((_target_velocity.X - vel.X)/1.2f)*PID_D; | 1030 | vec.X = ((_target_velocity.X - vel.X)/1.2f)*PID_D; |
| 1031 | } | 1031 | } |
| 1032 | if (_target_velocity.Y > 0) | 1032 | if (Math.Abs(_target_velocity.Y) > 0) |
| 1033 | { | 1033 | { |
| 1034 | vec.Y = ((_target_velocity.Y - vel.Y)/1.2f)*PID_D; | 1034 | vec.Y = ((_target_velocity.Y - vel.Y)/1.2f)*PID_D; |
| 1035 | } | 1035 | } |