6 files changed, 68 insertions, 65 deletions

diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 49f60f8..798a0a4 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -25,8 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using log4net;
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using OpenSim.Framework;
 using OpenMetaverse;
 
@@ -46,10 +48,10 @@ namespace OpenSim.Region.Physics.Manager
 
     public enum PIDHoverType
     {
-        Ground
-        , GroundAndWater
-        , Water
-        , Absolute
+        Ground,
+        GroundAndWater,
+        Water,
+        Absolute
     }
 
     public struct ContactPoint
@@ -114,6 +116,8 @@ namespace OpenSim.Region.Physics.Manager
 
     public abstract class PhysicsActor
     {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         public delegate void RequestTerseUpdate();
         public delegate void CollisionUpdate(EventArgs e);
         public delegate void OutOfBounds(Vector3 pos);
@@ -197,10 +201,10 @@ namespace OpenSim.Region.Physics.Manager
         {
             CollisionUpdate handler = OnCollisionUpdate;
 
+//            m_log.DebugFormat("[PHYSICS ACTOR]: Sending collision for {0}", LocalID);
+
             if (handler != null)
-            {
                 handler(e);
-            }
         }
 
         public virtual void SetMaterial (int material)
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 3630510..c37d588 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -108,7 +108,6 @@ namespace OpenSim.Region.Physics.OdePlugin
         /// </summary>
         private Vector3 m_taintForce;
 
-        internal uint m_localID = 0;
         // taints and their non-tainted counterparts
         private bool m_isPhysical = false; // the current physical status
         private bool m_tainted_isPhysical = false; // set when the physical status is tainted (false=not existing in physics engine, true=existing)
@@ -231,11 +230,6 @@ namespace OpenSim.Region.Physics.OdePlugin
             set { m_alwaysRun = value; }
         }
 
-        public override uint LocalID
-        {
-            set { m_localID = value; }
-        }
-
         public override bool Grabbed
         {
             set { return; }
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index ffd6dc0..f07cf46 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -142,8 +142,6 @@ namespace OpenSim.Region.Physics.OdePlugin
         public bool m_taintselected { get; private set; }
         public bool m_taintCollidesWater { get; private set; }
 
-        public uint m_localID { get; private set; }
-
         private bool m_taintforce = false;
         private bool m_taintaddangularforce = false;
         private Vector3 m_force;
@@ -290,13 +288,6 @@ namespace OpenSim.Region.Physics.OdePlugin
             set { return; }
         }
 
-        public override uint LocalID
-        {
-            set {
-                //m_log.Info("[PHYSICS]: Setting TrackerID: " + value);
-                m_localID = value; }
-        }
-
         public override bool Grabbed
         {
             set { return; }
@@ -1058,7 +1049,7 @@ Console.WriteLine("ZProcessTaints for " + Name);
         private void AddChildPrim(OdePrim prim)
         {
 //Console.WriteLine("AddChildPrim  " + Name);
-            if (this.m_localID != prim.m_localID)
+            if (LocalID != prim.LocalID)
             {
                 if (Body == IntPtr.Zero)
                 {
diff --git a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
index 9d7aa94..7e3ec63 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODERayCastRequestManager.cs
@@ -378,12 +378,13 @@ namespace OpenSim.Region.Physics.OdePlugin
             // Loop over contacts, build results.
             for (int i = 0; i < count; i++)
             {
-                if (p1 != null) { 
+                if (p1 != null)
+                {
                     if (p1 is OdePrim)
                     {
                         ContactResult collisionresult = new ContactResult();
                     
-                        collisionresult.ConsumerID = ((OdePrim)p1).m_localID;
+                        collisionresult.ConsumerID = p1.LocalID;
                         collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z);
                         collisionresult.Depth = contacts[i].depth;
                         collisionresult.Normal = new Vector3(contacts[i].normal.X, contacts[i].normal.Y,
@@ -399,7 +400,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                     {
                         ContactResult collisionresult = new ContactResult();
 
-                        collisionresult.ConsumerID = ((OdePrim)p2).m_localID;
+                        collisionresult.ConsumerID = p2.LocalID;
                         collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z);
                         collisionresult.Depth = contacts[i].depth;
                         collisionresult.Normal = new Vector3(contacts[i].normal.X, contacts[i].normal.Y,
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index c3279c6..43d852b 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -219,9 +219,14 @@ namespace OpenSim.Region.Physics.OdePlugin
         private readonly List<d.ContactGeom> _perloopContact = new List<d.ContactGeom>();
 
         /// <summary>
-        /// A list of actors that should receive collision events.
+        /// A dictionary of actors that should receive collision events.
         /// </summary>
-        private readonly List<PhysicsActor> _collisionEventPrim = new List<PhysicsActor>();
+        private readonly Dictionary<uint, PhysicsActor> _collisionEventPrim = new Dictionary<uint, PhysicsActor>();
+
+        /// <summary>
+        /// A dictionary of collision event changes that are waiting to be processed.
+        /// </summary>
+        private readonly Dictionary<uint, PhysicsActor> _collisionEventPrimChanges = new Dictionary<uint, PhysicsActor>();
         
         private readonly HashSet<OdeCharacter> _badCharacter = new HashSet<OdeCharacter>();
         public Dictionary<IntPtr, String> geom_name_map = new Dictionary<IntPtr, String>();
@@ -1301,8 +1306,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                     {
                         case ActorTypes.Agent:
                             cc1 = (OdeCharacter)p1;
-                            obj2LocalID = cc1.m_localID;
-                            cc1.AddCollisionEvent(cc2.m_localID, contact);
+                            obj2LocalID = cc1.LocalID;
+                            cc1.AddCollisionEvent(cc2.LocalID, contact);
                             //ctype = (int)CollisionCategories.Character;
 
                             //if (cc1.CollidingObj)
@@ -1317,8 +1322,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                             if (p1 is OdePrim)
                             {
                                 cp1 = (OdePrim) p1;
-                                obj2LocalID = cp1.m_localID;
-                                cp1.AddCollisionEvent(cc2.m_localID, contact);
+                                obj2LocalID = cp1.LocalID;
+                                cp1.AddCollisionEvent(cc2.LocalID, contact);
                             }
                             //ctype = (int)CollisionCategories.Geom;
 
@@ -1354,8 +1359,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                                 if (p1 is OdeCharacter)
                                 {
                                     cc1 = (OdeCharacter) p1;
-                                    obj2LocalID = cc1.m_localID;
-                                    cc1.AddCollisionEvent(cp2.m_localID, contact);
+                                    obj2LocalID = cc1.LocalID;
+                                    cc1.AddCollisionEvent(cp2.LocalID, contact);
                                     //ctype = (int)CollisionCategories.Character;
 
                                     //if (cc1.CollidingObj)
@@ -1370,8 +1375,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                                 if (p1 is OdePrim)
                                 {
                                     cp1 = (OdePrim) p1;
-                                    obj2LocalID = cp1.m_localID;
-                                    cp1.AddCollisionEvent(cp2.m_localID, contact);
+                                    obj2LocalID = cp1.LocalID;
+                                    cp1.AddCollisionEvent(cp2.LocalID, contact);
                                     //ctype = (int)CollisionCategories.Geom;
 
                                     //if (cp1.CollidingObj)
@@ -1633,13 +1638,10 @@ namespace OpenSim.Region.Physics.OdePlugin
         /// <param name="obj"></param>
         internal void AddCollisionEventReporting(PhysicsActor obj)
         {
-//            m_log.DebugFormat("[PHYSICS]: Adding {0} to collision event reporting", obj.SOPName);
+//            m_log.DebugFormat("[PHYSICS]: Adding {0} {1} to collision event reporting", obj.SOPName, obj.LocalID);
             
-            lock (_collisionEventPrim)
-            {
-                if (!_collisionEventPrim.Contains(obj))
-                    _collisionEventPrim.Add(obj);
-            }
+            lock (_collisionEventPrimChanges)
+                _collisionEventPrimChanges[obj.LocalID] = obj;
         }
 
         /// <summary>
@@ -1648,10 +1650,10 @@ namespace OpenSim.Region.Physics.OdePlugin
         /// <param name="obj"></param>
         internal void RemoveCollisionEventReporting(PhysicsActor obj)
         {
-//            m_log.DebugFormat("[PHYSICS]: Removing {0} from collision event reporting", obj.SOPName);
+//            m_log.DebugFormat("[PHYSICS]: Removing {0} {1} from collision event reporting", obj.SOPName, obj.LocalID);
 
-            lock (_collisionEventPrim)
-                _collisionEventPrim.Remove(obj);
+            lock (_collisionEventPrimChanges)
+                _collisionEventPrimChanges[obj.LocalID] = null;
         }
 
         #region Add/Remove Entities
@@ -1752,9 +1754,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
                                                   Vector3 size, Quaternion rotation, bool isPhysical, uint localid)
         {
-#if SPAM
-            m_log.DebugFormat("[PHYSICS]: Adding physics actor to {0}", primName);
-#endif
+//            m_log.DebugFormat("[ODE SCENE]: Adding physics actor to {0} {1}", primName, localid);
 
             return AddPrim(primName, position, size, rotation, pbs, isPhysical, localid);
         }
@@ -2663,6 +2663,22 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
 //                m_physicsiterations = 10;
 //            }
 
+            // We change _collisionEventPrimChanges to avoid locking _collisionEventPrim itself and causing potential
+            // deadlock if the collision event tries to lock something else later on which is already locked by a
+            // caller that is adding or removing the collision event.
+            lock (_collisionEventPrimChanges)
+            {
+                foreach (KeyValuePair<uint, PhysicsActor> kvp in _collisionEventPrimChanges)
+                {
+                    if (kvp.Value == null)
+                        _collisionEventPrim.Remove(kvp.Key);
+                    else
+                        _collisionEventPrim[kvp.Key] = kvp.Value;
+                }
+
+                _collisionEventPrimChanges.Clear();
+            }
+
             if (SupportsNINJAJoints)
             {
                 DeleteRequestedJoints(); // this must be outside of the lock (OdeLock) to avoid deadlocks
@@ -2790,25 +2806,22 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
 
                         collision_optimized();
 
-                        lock (_collisionEventPrim)
+                        foreach (PhysicsActor obj in _collisionEventPrim.Values)
                         {
-                            foreach (PhysicsActor obj in _collisionEventPrim)
-                            {
-//                                m_log.DebugFormat("[PHYSICS]: Assessing {0} for collision events", obj.SOPName);
+//                                m_log.DebugFormat("[PHYSICS]: Assessing {0} {1} for collision events", obj.SOPName, obj.LocalID);
 
-                                switch ((ActorTypes)obj.PhysicsActorType)
-                                {
-                                    case ActorTypes.Agent:
-                                        OdeCharacter cobj = (OdeCharacter)obj;
-                                        cobj.AddCollisionFrameTime(100);
-                                        cobj.SendCollisions();
-                                        break;
+                            switch ((ActorTypes)obj.PhysicsActorType)
+                            {
+                                case ActorTypes.Agent:
+                                    OdeCharacter cobj = (OdeCharacter)obj;
+                                    cobj.AddCollisionFrameTime(100);
+                                    cobj.SendCollisions();
+                                    break;
 
-                                    case ActorTypes.Prim:
-                                        OdePrim pobj = (OdePrim)obj;
-                                        pobj.SendCollisions();
-                                        break;
-                                }
+                                case ActorTypes.Prim:
+                                    OdePrim pobj = (OdePrim)obj;
+                                    pobj.SendCollisions();
+                                    break;
                             }
                         }
 
@@ -3731,7 +3744,7 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
                 {
                     if (prm.CollisionScore > 0)
                     {
-                        returncolliders.Add(prm.m_localID, prm.CollisionScore);
+                        returncolliders.Add(prm.LocalID, prm.CollisionScore);
                         cnt++;
                         prm.CollisionScore = 0f;
                         if (cnt > 25)
diff --git a/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs b/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs
index 2ea810f..cbc6b95 100644
--- a/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs
+++ b/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Physics.OdePlugin.Tests
                 m_log.Info("TargetSpace: " + oprim.m_targetSpace + " - SceneMainSpace: " + pscene.space);
 
                 Assert.That(!oprim.m_taintadd);
-                m_log.Info("Prim Position (" + oprim.m_localID + "): " + prim.Position.ToString());
+                m_log.Info("Prim Position (" + oprim.LocalID + "): " + prim.Position);
 
                 // Make sure we're above the ground
                 //Assert.That(prim.Position.Z > 20f);