Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster

1 files changed, 9 insertions, 5 deletions

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index 7632e25..9ca2d3f 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -455,15 +455,15 @@ namespace OpenSim.Region.Physics.OdePlugin
 
                     geomDefaultDensity = physicsconfig.GetFloat("geometry_default_density", geomDefaultDensity);
                     bodyFramesAutoDisable = physicsconfig.GetInt("body_frames_auto_disable", bodyFramesAutoDisable);
-
+/*
                     bodyPIDD = physicsconfig.GetFloat("body_pid_derivative", bodyPIDD);
                     bodyPIDG = physicsconfig.GetFloat("body_pid_gain", bodyPIDG);
-
+*/
                     forceSimplePrimMeshing = physicsconfig.GetBoolean("force_simple_prim_meshing", forceSimplePrimMeshing);
                     meshSculptedPrim = physicsconfig.GetBoolean("mesh_sculpted_prim", meshSculptedPrim);
                     meshSculptLOD = physicsconfig.GetFloat("mesh_lod", meshSculptLOD);
                     MeshSculptphysicalLOD = physicsconfig.GetFloat("mesh_physical_lod", MeshSculptphysicalLOD);
-
+/*
                     if (Environment.OSVersion.Platform == PlatformID.Unix)
                     {
                         avPIDD = physicsconfig.GetFloat("av_pid_derivative_linux", avPIDD);
@@ -471,10 +471,11 @@ namespace OpenSim.Region.Physics.OdePlugin
                     }
                     else
                     {
+ 
                         avPIDD = physicsconfig.GetFloat("av_pid_derivative_win", avPIDD);
                         avPIDP = physicsconfig.GetFloat("av_pid_proportional_win", avPIDP);
                     }
-
+*/
                     physics_logging = physicsconfig.GetBoolean("physics_logging", false);
                     physics_logging_interval = physicsconfig.GetInt("physics_logging_interval", 0);
                     physics_logging_append_existing_logfile = physicsconfig.GetBoolean("physics_logging_append_existing_logfile", false);
@@ -1860,6 +1861,9 @@ namespace OpenSim.Region.Physics.OdePlugin
 
                 statstart = Util.EnvironmentTickCount();
 
+/*
+// now included in characters move() and done at ode rate
+//  maybe be needed later if we need to do any extra work at hearbeat rate
                 lock (_characters)
                 {
                     foreach (OdeCharacter actor in _characters)
@@ -1873,7 +1877,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                         }
                     }
                 }
-
+*/
                 lock (_badCharacter)
                 {
                     if (_badCharacter.Count > 0)