diff options
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs index 9c1b87b..1c8de56 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |||
@@ -851,10 +851,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
851 | float depth = terrainheight - chrminZ; | 851 | float depth = terrainheight - chrminZ; |
852 | if (!flying) | 852 | if (!flying) |
853 | { | 853 | { |
854 | vec.Z = -vel.Z * PID_D * 1.5f + depth * PID_P * 50; | 854 | vec.Z = -vel.Z * PID_D * 1.5f + depth * PID_P * 30; |
855 | } | 855 | } |
856 | else | 856 | else |
857 | vec.Z = depth * PID_P * 50; | 857 | vec.Z = depth * PID_P * 30; |
858 | 858 | ||
859 | /* | 859 | /* |
860 | Vector3 vtmp; | 860 | Vector3 vtmp; |
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index 7632e25..837eae3 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
@@ -455,15 +455,15 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
455 | 455 | ||
456 | geomDefaultDensity = physicsconfig.GetFloat("geometry_default_density", geomDefaultDensity); | 456 | geomDefaultDensity = physicsconfig.GetFloat("geometry_default_density", geomDefaultDensity); |
457 | bodyFramesAutoDisable = physicsconfig.GetInt("body_frames_auto_disable", bodyFramesAutoDisable); | 457 | bodyFramesAutoDisable = physicsconfig.GetInt("body_frames_auto_disable", bodyFramesAutoDisable); |
458 | 458 | /* | |
459 | bodyPIDD = physicsconfig.GetFloat("body_pid_derivative", bodyPIDD); | 459 | bodyPIDD = physicsconfig.GetFloat("body_pid_derivative", bodyPIDD); |
460 | bodyPIDG = physicsconfig.GetFloat("body_pid_gain", bodyPIDG); | 460 | bodyPIDG = physicsconfig.GetFloat("body_pid_gain", bodyPIDG); |
461 | 461 | */ | |
462 | forceSimplePrimMeshing = physicsconfig.GetBoolean("force_simple_prim_meshing", forceSimplePrimMeshing); | 462 | forceSimplePrimMeshing = physicsconfig.GetBoolean("force_simple_prim_meshing", forceSimplePrimMeshing); |
463 | meshSculptedPrim = physicsconfig.GetBoolean("mesh_sculpted_prim", meshSculptedPrim); | 463 | meshSculptedPrim = physicsconfig.GetBoolean("mesh_sculpted_prim", meshSculptedPrim); |
464 | meshSculptLOD = physicsconfig.GetFloat("mesh_lod", meshSculptLOD); | 464 | meshSculptLOD = physicsconfig.GetFloat("mesh_lod", meshSculptLOD); |
465 | MeshSculptphysicalLOD = physicsconfig.GetFloat("mesh_physical_lod", MeshSculptphysicalLOD); | 465 | MeshSculptphysicalLOD = physicsconfig.GetFloat("mesh_physical_lod", MeshSculptphysicalLOD); |
466 | 466 | /* | |
467 | if (Environment.OSVersion.Platform == PlatformID.Unix) | 467 | if (Environment.OSVersion.Platform == PlatformID.Unix) |
468 | { | 468 | { |
469 | avPIDD = physicsconfig.GetFloat("av_pid_derivative_linux", avPIDD); | 469 | avPIDD = physicsconfig.GetFloat("av_pid_derivative_linux", avPIDD); |
@@ -471,10 +471,11 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
471 | } | 471 | } |
472 | else | 472 | else |
473 | { | 473 | { |
474 | |||
474 | avPIDD = physicsconfig.GetFloat("av_pid_derivative_win", avPIDD); | 475 | avPIDD = physicsconfig.GetFloat("av_pid_derivative_win", avPIDD); |
475 | avPIDP = physicsconfig.GetFloat("av_pid_proportional_win", avPIDP); | 476 | avPIDP = physicsconfig.GetFloat("av_pid_proportional_win", avPIDP); |
476 | } | 477 | } |
477 | 478 | */ | |
478 | physics_logging = physicsconfig.GetBoolean("physics_logging", false); | 479 | physics_logging = physicsconfig.GetBoolean("physics_logging", false); |
479 | physics_logging_interval = physicsconfig.GetInt("physics_logging_interval", 0); | 480 | physics_logging_interval = physicsconfig.GetInt("physics_logging_interval", 0); |
480 | physics_logging_append_existing_logfile = physicsconfig.GetBoolean("physics_logging_append_existing_logfile", false); | 481 | physics_logging_append_existing_logfile = physicsconfig.GetBoolean("physics_logging_append_existing_logfile", false); |