2 files changed, 13 insertions, 13 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index e9492a9..81126b6 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -704,7 +704,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 _zeroFlag = false;
                 if (m_iscolliding && !flying)
                 {
-                    // We're flying and colliding with something
+                    // We're standing on something
                     vec.X = ((_target_velocity.X / movementdivisor) - vel.X) * (PID_D);
                     vec.Y = ((_target_velocity.Y / movementdivisor) - vel.Y) * (PID_D);
                 }
@@ -716,7 +716,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 }
                 else if (!m_iscolliding && flying)
                 {
-                    // We're flying and colliding with something
+                    // we're in mid air suspended
                     vec.X = ((_target_velocity.X / movementdivisor) - vel.X) * (PID_D/6);
                     vec.Y = ((_target_velocity.Y / movementdivisor) - vel.Y) * (PID_D/6);
                 }
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 673818a..33b9ce3 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1537,11 +1537,11 @@ namespace OpenSim.Region.Physics.OdePlugin
                 
                 while (step_time > 0.0f)
                 {
-                    lock (ode)
-                    {
-                        if (!ode.lockquery())
-                        { 
-                            ode.dlock(world);
+                    //lock (ode)
+                    //{
+                        //if (!ode.lockquery())
+                        //{ 
+                           // ode.dlock(world);
                             try
                             {
                                 lock (_characters)
@@ -1605,12 +1605,12 @@ namespace OpenSim.Region.Physics.OdePlugin
                                 
                             step_time -= ODE_STEPSIZE;
                             i++;
-                        }
-                        else
-                        {
-                            fps = 0;
-                        }
-                    }
+                        //}
+                        //else
+                        //{
+                            //fps = 0;
+                        //}
+                    //}
                 }
 
                 lock (_characters)