diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 7f3ae6b35f..d10564c639 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -897,15 +897,14 @@ namespace OpenSim.Region.Physics.OdePlugin
/// Called from Simulate
/// This is the avatar's movement control + PID Controller
///
- ///
///
/// If there is something wrong with the character (e.g. its position is non-finite)
/// then it is added to this list. The ODE structures associated with it are also destroyed.
///
- public void Move(float timeStep, List defects)
+ internal void Move(List defects)
{
// no lock; for now it's only called from within Simulate()
-
+
// If the PID Controller isn't active then we set our force
// calculating base velocity to the current position
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index 3a919fcbf4..916c3becb2 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -1451,8 +1451,7 @@ namespace OpenSim.Region.Physics.OdePlugin
///
/// This is our collision testing routine in ODE
///
- ///
- private void collision_optimized(float timeStep)
+ private void collision_optimized()
{
_perloopContact.Clear();
@@ -2664,12 +2663,6 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
while (step_time > 0.0f)
{
- //lock (ode)
- //{
- //if (!ode.lockquery())
- //{
- // ode.dlock(world);
-
try
{
// Insert, remove Characters
@@ -2738,7 +2731,7 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
foreach (OdeCharacter actor in _characters)
{
if (actor != null)
- actor.Move(timeStep, defects);
+ actor.Move(defects);
}
if (0 != defects.Count)
{
@@ -2765,7 +2758,7 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
//int RayCastTimeMS = m_rayCastManager.ProcessQueuedRequests();
m_rayCastManager.ProcessQueuedRequests();
- collision_optimized(timeStep);
+ collision_optimized();
lock (_collisionEventPrim)
{