aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index e9492a9..81126b6 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -704,7 +704,7 @@ namespace OpenSim.Region.Physics.OdePlugin
704 _zeroFlag = false; 704 _zeroFlag = false;
705 if (m_iscolliding && !flying) 705 if (m_iscolliding && !flying)
706 { 706 {
707 // We're flying and colliding with something 707 // We're standing on something
708 vec.X = ((_target_velocity.X / movementdivisor) - vel.X) * (PID_D); 708 vec.X = ((_target_velocity.X / movementdivisor) - vel.X) * (PID_D);
709 vec.Y = ((_target_velocity.Y / movementdivisor) - vel.Y) * (PID_D); 709 vec.Y = ((_target_velocity.Y / movementdivisor) - vel.Y) * (PID_D);
710 } 710 }
@@ -716,7 +716,7 @@ namespace OpenSim.Region.Physics.OdePlugin
716 } 716 }
717 else if (!m_iscolliding && flying) 717 else if (!m_iscolliding && flying)
718 { 718 {
719 // We're flying and colliding with something 719 // we're in mid air suspended
720 vec.X = ((_target_velocity.X / movementdivisor) - vel.X) * (PID_D/6); 720 vec.X = ((_target_velocity.X / movementdivisor) - vel.X) * (PID_D/6);
721 vec.Y = ((_target_velocity.Y / movementdivisor) - vel.Y) * (PID_D/6); 721 vec.Y = ((_target_velocity.Y / movementdivisor) - vel.Y) * (PID_D/6);
722 } 722 }