2 files changed, 8 insertions, 8 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 1490a9b..9d6b773 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -361,10 +361,10 @@ namespace OpenSim.Region.Physics.OdePlugin
 
                     if (Environment.OSVersion.Platform == PlatformID.Unix)
                     {
-                        avPIDD = physicsconfig.GetFloat("av_pid_derivative_linux", 3200.0f);
-                        avPIDP = physicsconfig.GetFloat("av_pid_proportional_linux", 1400.0f);
-                        avStandupTensor = physicsconfig.GetFloat("av_capsule_standup_tensor_linux", 2000000f);
-                        bodyMotorJointMaxforceTensor = physicsconfig.GetFloat("body_motor_joint_maxforce_tensor_linux", 2f);
+                        avPIDD = physicsconfig.GetFloat("av_pid_derivative_linux", 2200.0f);
+                        avPIDP = physicsconfig.GetFloat("av_pid_proportional_linux", 900.0f);
+                        avStandupTensor = physicsconfig.GetFloat("av_capsule_standup_tensor_linux", 550000f);
+                        bodyMotorJointMaxforceTensor = physicsconfig.GetFloat("body_motor_joint_maxforce_tensor_linux", 5f);
                     }
                     else
                     {
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 9772b3f..c9d97a5 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -260,8 +260,8 @@ objectcontact_bounce = 0.2
 ; desired velocity
 ; See http://en.wikipedia.org/wiki/PID_controller
 
-av_pid_derivative_linux = 3200.0
-av_pid_proportional_linux = 1400.0
+av_pid_derivative_linux = 2200.0
+av_pid_proportional_linux = 900.0;
 
 av_pid_derivative_win = 2200.0
 av_pid_proportional_win = 900.0;
@@ -271,7 +271,7 @@ av_capsule_radius = 0.37
 
 ; Max force permissible to use to keep the avatar standing up straight
 av_capsule_standup_tensor_win = 550000
-av_capsule_standup_tensor_linux = 2000000
+av_capsule_standup_tensor_linux = 550000
 
 ; used to calculate mass of avatar.
 ; float AVvolume = (float) (Math.PI*Math.Pow(CAPSULE_RADIUS, 2)*CAPSULE_LENGTH);
@@ -314,7 +314,7 @@ geom_contactpoints_start_throttling = 3
 geom_updates_before_throttled_update = 15
 
 ; Used for llSetStatus.  How rigid the object rotation is held on the axis specified
-body_motor_joint_maxforce_tensor_linux = 2
+body_motor_joint_maxforce_tensor_linux = 5
 body_motor_joint_maxforce_tensor_win = 5
 
 ; ##