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

2 files changed, 44 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index fcdec5d..d3aa4aa 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -311,6 +311,44 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
         {
             remote_client.sendEstateCovenantInformation();
         }
+        private void HandleLandStatRequest(int parcelID, uint reportType, uint requestFlags, string filter, IClientAPI remoteClient)
+        {
+            Dictionary<uint, float> colliders = m_scene.PhysicsScene.GetTopColliders();
+            
+            List<LandStatReportItem> collidera = new List<LandStatReportItem>();
+            lock (colliders)
+            {
+                foreach (uint obj in colliders.Keys)
+                {
+                    SceneObjectPart prt = m_scene.GetSceneObjectPart(obj);
+                    if (prt != null)
+                    {
+                        if (prt.ParentGroup != null)
+                        {
+                            SceneObjectGroup sog = prt.ParentGroup;
+                            if (sog != null)
+                            {
+                                LandStatReportItem lsri = new LandStatReportItem();
+                                lsri.LocationX = sog.AbsolutePosition.X;
+                                lsri.LocationY = sog.AbsolutePosition.Y;
+                                lsri.LocationZ = sog.AbsolutePosition.Z;
+                                lsri.Score = colliders[obj];
+                                lsri.TaskID = sog.UUID;
+                                lsri.TaskLocalID = sog.LocalId;
+                                lsri.TaskName = sog.GetPartName(obj);
+                                lsri.OwnerName = m_scene.CommsManager.UUIDNameRequestString(sog.OwnerID);
+
+                                
+                                collidera.Add(lsri);
+                            }
+                        }
+                    }
+
+                }
+            }
+            remoteClient.SendLandStatReply(reportType, requestFlags, (uint)collidera.Count,collidera.ToArray());
+
+        }
 
         #endregion
 
@@ -435,6 +473,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
 
             client.OnRegionInfoRequest += HandleRegionInfoRequest;
             client.OnEstateCovenantRequest += HandleEstateCovenantRequest;
+            client.OnLandStatRequest += HandleLandStatRequest;
             sendRegionHandshake(client);
         }
     }
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index cd5ca61..09069a9 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -271,7 +271,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
         public event AgentSit OnUndo;
 
         public event ForceReleaseControls OnForceReleaseControls;
-
+        public event GodLandStatRequest OnLandStatRequest;
         public event RequestObjectPropertiesFamily OnObjectGroupRequest;
 
         public event DetailedEstateDataRequest OnDetailedEstateDataRequest;
@@ -764,6 +764,10 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
         public void SendGroupNameReply(LLUUID groupLLUID, string GroupName)
         {
         }
+
+        public void SendLandStatReply(uint reportType, uint requestFlags, uint resultCount, LandStatReportItem[] lsrpia)
+        {
+        }
         #endregion
     }
 }