* 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.

OpenSim/Region/Physics/OdePlugin/ODEPrim.cs

@@ -1072,6 +1072,8 @@ namespace OpenSim.Region.Physics.OdePlugin
 
         }
         private void changevelocity(float timestep)
+        {
+            lock (ode)
             {
                 while (ode.lockquery())
                 {
@@ -1088,7 +1090,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 }
 
                 ode.dunlock(_parent_scene.world);
-
+            }
             //resetCollisionAccounting();
             m_taintVelocity = PhysicsVector.Zero;
         }