* Adds Top Colliders when using ODE. Access it from the estate tools/debug tab.

2 files changed, 13 insertions, 1 deletions

diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 3cf2646..c87e748 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -176,7 +176,7 @@ namespace OpenSim.Region.Physics.Manager
         public abstract PhysicsVector GeometricCenter { get; }
         public abstract PhysicsVector CenterOfMass { get; }
         public abstract PhysicsVector Velocity { get; set; }
-        public abstract float CollisionScore { get;}
+        public abstract float CollisionScore { get; set;}
         public abstract PhysicsVector Acceleration { get; }
         public abstract Quaternion Orientation { get; set; }
         public abstract int PhysicsActorType { get; set; }
@@ -208,8 +208,10 @@ namespace OpenSim.Region.Physics.Manager
         public override bool Stopped
         {
             get{ return false; }
+            
         }
 
+
         public override PhysicsVector Position
         {
             get { return PhysicsVector.Zero; }
@@ -300,6 +302,7 @@ namespace OpenSim.Region.Physics.Manager
         public override float CollisionScore
         {
             get { return 0f; }
+            set { }
         }
 
         public override void CrossingFailure()
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index de93f22..f9d990b 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System.Collections.Generic;
 using System.Reflection;
 using Axiom.Math;
 using log4net;
@@ -86,6 +87,8 @@ namespace OpenSim.Region.Physics.Manager
 
         public abstract void Dispose();
 
+        public abstract Dictionary<uint, float> GetTopColliders();
+
         public abstract bool IsThreaded { get; }
 
         private class NullPhysicsScene : PhysicsScene
@@ -170,6 +173,12 @@ namespace OpenSim.Region.Physics.Manager
             public override void Dispose()
             {
             }
+
+            public override Dictionary<uint,float> GetTopColliders()
+            {
+                Dictionary<uint, float> returncolliders = new Dictionary<uint, float>();
+                return returncolliders;
+            }
         }
     }
 }