3 files changed, 34 insertions, 2 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 5024b5d..89162a0 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -570,6 +570,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         public override float CollisionScore
         {
             get { return 0f; }
+            set { }
         }
 
         public override bool Kinematic
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 4c8eb20..6ade638 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         private bool m_throttleUpdates = false;
         private int throttleCounter = 0;
         public int m_interpenetrationcount = 0;
-        public int m_collisionscore = 0;
+        public float m_collisionscore = 0;
         public int m_roundsUnderMotionThreshold = 0;
         private int m_crossingfailures = 0;
 
@@ -243,7 +243,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 // is physical or the object is modified somehow *IN THE FUTURE*
                 // without this, if an avatar selects prim, they can walk right
                 // through it while it's selected
-
+                m_collisionscore = 0;
                 if ((m_isphysical && !_zeroFlag) || !value)
                 {
                     m_taintselected = value;
@@ -1783,6 +1783,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         public override float CollisionScore
         {
             get { return m_collisionscore; }
+            set { m_collisionscore = value; }
         }
 
         public override bool Kinematic
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index fef0c4e..e43a1ac 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -555,6 +555,13 @@ namespace OpenSim.Region.Physics.OdePlugin
             }
 
             float max_collision_depth = 0f;
+            if (p1.CollisionScore + count >= float.MaxValue)
+                p1.CollisionScore = 0;
+            p1.CollisionScore += count;
+
+            if (p2.CollisionScore + count >= float.MaxValue)
+                p2.CollisionScore = 0;
+            p2.CollisionScore += count;
 
             for (int i = 0; i < count; i++)
             {
@@ -585,6 +592,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                         p2.CollidingGround = true;
                         break;
                 }
+                
 
                 // we don't want prim or avatar to explode
 
@@ -2162,5 +2170,27 @@ namespace OpenSim.Region.Physics.OdePlugin
                 //d.CloseODE();
             }
         }
+        public override Dictionary<uint, float> GetTopColliders()
+        {
+            Dictionary<uint, float> returncolliders = new Dictionary<uint, float>();
+            int cnt = 0;
+            lock (_prims)
+            {
+                foreach (OdePrim prm in _prims)
+                {
+                    if (prm.CollisionScore > 0)
+                    {
+                        returncolliders.Add(prm.m_localID, prm.CollisionScore);
+                        cnt++;
+                        prm.CollisionScore = 0f;
+                        if (cnt > 25)
+                        {
+                            break;
+                        }
+                    }
+                }
+            }
+            return returncolliders;
+        }
     }
 }