* Fixing thread safety of avatar adding and removing from the Physics Scene in the ODEPlugin

* This may help one of the symptoms or mantis 3363 , however it probably won't solve the occasional NonFinite Avatar Position detected..  issues that some people see.    That is probably an entirely different issue(NaN).

1 files changed, 25 insertions, 6 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 732d99b..e3ac668 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1339,20 +1339,39 @@ namespace OpenSim.Region.Physics.OdePlugin
             OdeCharacter newAv = new OdeCharacter(avName, this, pos, ode, size, avPIDD, avPIDP, avCapRadius, avStandupTensor, avDensity, avHeightFudgeFactor, avMovementDivisorWalk, avMovementDivisorRun);
             newAv.Flying = isFlying;
             newAv.MinimumGroundFlightOffset = minimumGroundFlightOffset;
-            _characters.Add(newAv);
+            
             return newAv;
         }
 
-        public override void RemoveAvatar(PhysicsActor actor)
+        public void AddCharacter(OdeCharacter chr)
         {
-            lock (OdeLock)
+            lock (_characters)
             {
-                //m_log.Debug("[PHYSICS]:ODELOCK");
-                ((OdeCharacter) actor).Destroy();
-                _characters.Remove((OdeCharacter) actor);
+                if (!_characters.Contains(chr))
+                {
+                    _characters.Add(chr);
+                }
             }
         }
 
+        public void RemoveCharacter(OdeCharacter chr)
+        {
+            lock (_characters)
+            {
+                if (_characters.Contains(chr))
+                {
+                    _characters.Remove(chr);
+                }
+            }
+        }
+
+        public override void RemoveAvatar(PhysicsActor actor)
+        {
+            //m_log.Debug("[PHYSICS]:ODELOCK");
+            ((OdeCharacter) actor).Destroy();
+            
+        }
+
         private PhysicsActor AddPrim(String name, PhysicsVector position, PhysicsVector size, Quaternion rotation,
                                      IMesh mesh, PrimitiveBaseShape pbs, bool isphysical)
         {