aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
index b9ec6b5..b28bc4a 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs
@@ -683,7 +683,7 @@ namespace OpenSim.Region.Physics.OdePlugin
683 PID_D *= m_mass / _parent_scene.ODE_STEPSIZE; 683 PID_D *= m_mass / _parent_scene.ODE_STEPSIZE;
684 PID_P /= 50 * 80; 684 PID_P /= 50 * 80;
685 PID_P *= m_mass / _parent_scene.ODE_STEPSIZE; 685 PID_P *= m_mass / _parent_scene.ODE_STEPSIZE;
686 686
687 Body = d.BodyCreate(_parent_scene.world); 687 Body = d.BodyCreate(_parent_scene.world);
688 688
689 d.BodySetAutoDisableFlag(Body, false); 689 d.BodySetAutoDisableFlag(Body, false);
@@ -862,10 +862,10 @@ namespace OpenSim.Region.Physics.OdePlugin
862 float depth = terrainheight - chrminZ; 862 float depth = terrainheight - chrminZ;
863 if (!flying) 863 if (!flying)
864 { 864 {
865 vec.Z = -vel.Z * PID_D * 1.5f + depth * PID_P * 30; 865 vec.Z = -vel.Z * PID_D * 3f + depth * PID_P * 60;
866 } 866 }
867 else 867 else
868 vec.Z = depth * PID_P * 30; 868 vec.Z = depth * PID_P * 60;
869 869
870 if (depth < 0.1f) 870 if (depth < 0.1f)
871 { 871 {
@@ -1171,7 +1171,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1171 CAPSULE_LENGTH = caplen; 1171 CAPSULE_LENGTH = caplen;
1172 1172
1173 AvatarGeomAndBodyCreation(_position.X, _position.Y, 1173 AvatarGeomAndBodyCreation(_position.X, _position.Y,
1174 _position.Z + (Math.Abs(CAPSULE_LENGTH - prevCapsule) * 2)); 1174 _position.Z + (CAPSULE_LENGTH - prevCapsule) * 0.5f);
1175 1175
1176 Velocity = Vector3.Zero; 1176 Velocity = Vector3.Zero;
1177 1177