* Last bit of cleanup now. As long as you keep physical prim off, you should have a reasonably stable experience with ODE again.

* Physical prim at the simulator edge still seems to have the occasional issue.

1 files changed, 13 insertions, 11 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 312fd9c..50087a5 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -1073,22 +1073,24 @@ namespace OpenSim.Region.Physics.OdePlugin
         }
         private void changevelocity(float timestep)
         {
-            while (ode.lockquery())
-            {
-            }
-            ode.dlock(_parent_scene.world);
-
-            System.Threading.Thread.Sleep(20);
-            if (IsPhysical)
+            lock (ode)
             {
-                if (Body != (IntPtr)0)
+                while (ode.lockquery())
                 {
-                    d.BodySetLinearVel(Body, m_taintVelocity.X, m_taintVelocity.Y, m_taintVelocity.Z);
                 }
-            }
+                ode.dlock(_parent_scene.world);
 
-            ode.dunlock(_parent_scene.world);
+                System.Threading.Thread.Sleep(20);
+                if (IsPhysical)
+                {
+                    if (Body != (IntPtr)0)
+                    {
+                        d.BodySetLinearVel(Body, m_taintVelocity.X, m_taintVelocity.Y, m_taintVelocity.Z);
+                    }
+                }
 
+                ode.dunlock(_parent_scene.world);
+            }
             //resetCollisionAccounting();
             m_taintVelocity = PhysicsVector.Zero;
         }