aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs8
-rw-r--r--bin/OpenSim.ini.example8
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
361 361
362 if (Environment.OSVersion.Platform == PlatformID.Unix) 362 if (Environment.OSVersion.Platform == PlatformID.Unix)
363 { 363 {
364 avPIDD = physicsconfig.GetFloat("av_pid_derivative_linux", 3200.0f); 364 avPIDD = physicsconfig.GetFloat("av_pid_derivative_linux", 2200.0f);
365 avPIDP = physicsconfig.GetFloat("av_pid_proportional_linux", 1400.0f); 365 avPIDP = physicsconfig.GetFloat("av_pid_proportional_linux", 900.0f);
366 avStandupTensor = physicsconfig.GetFloat("av_capsule_standup_tensor_linux", 2000000f); 366 avStandupTensor = physicsconfig.GetFloat("av_capsule_standup_tensor_linux", 550000f);
367 bodyMotorJointMaxforceTensor = physicsconfig.GetFloat("body_motor_joint_maxforce_tensor_linux", 2f); 367 bodyMotorJointMaxforceTensor = physicsconfig.GetFloat("body_motor_joint_maxforce_tensor_linux", 5f);
368 } 368 }
369 else 369 else
370 { 370 {
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
260; desired velocity 260; desired velocity
261; See http://en.wikipedia.org/wiki/PID_controller 261; See http://en.wikipedia.org/wiki/PID_controller
262 262
263av_pid_derivative_linux = 3200.0 263av_pid_derivative_linux = 2200.0
264av_pid_proportional_linux = 1400.0 264av_pid_proportional_linux = 900.0;
265 265
266av_pid_derivative_win = 2200.0 266av_pid_derivative_win = 2200.0
267av_pid_proportional_win = 900.0; 267av_pid_proportional_win = 900.0;
@@ -271,7 +271,7 @@ av_capsule_radius = 0.37
271 271
272; Max force permissible to use to keep the avatar standing up straight 272; Max force permissible to use to keep the avatar standing up straight
273av_capsule_standup_tensor_win = 550000 273av_capsule_standup_tensor_win = 550000
274av_capsule_standup_tensor_linux = 2000000 274av_capsule_standup_tensor_linux = 550000
275 275
276; used to calculate mass of avatar. 276; used to calculate mass of avatar.
277; float AVvolume = (float) (Math.PI*Math.Pow(CAPSULE_RADIUS, 2)*CAPSULE_LENGTH); 277; float AVvolume = (float) (Math.PI*Math.Pow(CAPSULE_RADIUS, 2)*CAPSULE_LENGTH);
@@ -314,7 +314,7 @@ geom_contactpoints_start_throttling = 3
314geom_updates_before_throttled_update = 15 314geom_updates_before_throttled_update = 15
315 315
316; Used for llSetStatus. How rigid the object rotation is held on the axis specified 316; Used for llSetStatus. How rigid the object rotation is held on the axis specified
317body_motor_joint_maxforce_tensor_linux = 2 317body_motor_joint_maxforce_tensor_linux = 5
318body_motor_joint_maxforce_tensor_win = 5 318body_motor_joint_maxforce_tensor_win = 5
319 319
320; ## 320; ##