* A few additional null checks in the Physics Scene and PhysicsActor so we don't try to enumerate dead null ODECharacter objects when things get *really* slow.

2 files changed, 6 insertions, 11 deletions

diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index f44c160..7e88479 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -139,10 +139,9 @@ namespace OpenSim.Region.Physics.Manager
             
             if (handler != null)
             {
-                lock (handler)
-                {
+                
                     handler();
-                }
+               
             }
         }
 
@@ -154,10 +153,7 @@ namespace OpenSim.Region.Physics.Manager
             OutOfBounds handler = OnOutOfBounds;
             if (handler != null)
             {
-                lock (handler)
-                {
                     handler(pos);
-                }
             }
         }
 
@@ -167,10 +163,7 @@ namespace OpenSim.Region.Physics.Manager
       
             if (handler != null)
             { 
-                lock (handler)
-                {
                     handler(e);
-                }
             }
             
         }
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index a8ee20d..b3780fd 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1272,7 +1272,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                             {
                                 foreach (OdeCharacter actor in _characters)
                                 {
-                                    actor.Move(timeStep);
+                                    if (actor != null) 
+                                        actor.Move(timeStep);
                                 }
 
                                 collision_optimized(timeStep);
@@ -1300,7 +1301,8 @@ namespace OpenSim.Region.Physics.OdePlugin
 
                 foreach (OdeCharacter actor in _characters)
                 {
-                    actor.UpdatePositionAndVelocity();
+                    if (actor != null)
+                        actor.UpdatePositionAndVelocity();
                 }
 
                 if (!ode.lockquery())