5 files changed, 31 insertions, 10 deletions

diff --git a/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs b/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs
index 69e2d17..e46714e 100644
--- a/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs
+++ b/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs
@@ -129,7 +129,9 @@ namespace OpenSim.Services.Connectors
 
                 }
                 else
-                    m_log.DebugFormat("[MAP IMAGE CONNECTOR]: RegisterRegion received null reply");
+                {
+                    m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Map post received null reply");
+                }
             }
             catch (Exception e)
             {
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 6fb583c..24a23dd 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -371,7 +371,7 @@ namespace OpenSim.Services.Connectors.Simulation
 
         private bool CloseAgent(GridRegion destination, UUID id, bool ChildOnly)
         {
-            // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start");
+//            m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start");
 
             string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/";
 
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 05cfe5f..89f0716 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -156,6 +156,7 @@ namespace OpenSim.Services.GridService
                     regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
                 return "Region overlaps another region";
             }
+
             if ((region != null) && (region.RegionID == regionInfos.RegionID) && 
                 ((region.posX != regionInfos.RegionLocX) || (region.posY != regionInfos.RegionLocY)))
             {
@@ -236,18 +237,21 @@ namespace OpenSim.Services.GridService
             }
 
             m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) registered successfully at {2}-{3}", 
-                regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY);
+                regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionCoordX, regionInfos.RegionCoordY);
 
             return String.Empty;
         }
 
         public bool DeregisterRegion(UUID regionID)
         {
-            m_log.DebugFormat("[GRID SERVICE]: Region {0} deregistered", regionID);
             RegionData region = m_Database.Get(regionID, UUID.Zero);
             if (region == null)
                 return false;
 
+            m_log.DebugFormat(
+                "[GRID SERVICE]: Deregistering region {0} ({1}) at {2}-{3}",
+                region.RegionName, region.RegionID, region.coordX, region.coordY);
+
             int flags = Convert.ToInt32(region.Data["flags"]);
 
             if (!m_DeleteOnUnregister || (flags & (int)OpenSim.Data.RegionFlags.Persistent) != 0)
@@ -292,7 +296,7 @@ namespace OpenSim.Services.GridService
                     }
                 }
 
-                m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighbours", region.RegionName, rinfos.Count);
+//                m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighbours", region.RegionName, rinfos.Count);
             }
             else
             {
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index a084309..2b0b947 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -103,9 +103,8 @@ namespace OpenSim.Services.Interfaces
         int GetRegionFlags(UUID scopeID, UUID regionID);
     }
 
-    public class GridRegion : Object
+    public class GridRegion
     {
-
         /// <summary>
         /// The port by which http communication occurs with the region 
         /// </summary>
@@ -149,6 +148,19 @@ namespace OpenSim.Services.Interfaces
 
         protected IPEndPoint m_internalEndPoint;
 
+        /// <summary>
+        /// The co-ordinate of this region.
+        /// </summary>
+        public int RegionCoordX { get { return RegionLocX / (int)Constants.RegionSize; } }
+
+        /// <summary>
+        /// The co-ordinate of this region
+        /// </summary>
+        public int RegionCoordY { get { return RegionLocY / (int)Constants.RegionSize; } }
+
+        /// <summary>
+        /// The location of this region in meters.
+        /// </summary>
         public int RegionLocX
         {
             get { return m_regionLocX; }
@@ -156,6 +168,9 @@ namespace OpenSim.Services.Interfaces
         }
         protected int m_regionLocX;
 
+        /// <summary>
+        /// The location of this region in meters.
+        /// </summary>
         public int RegionLocY
         {
             get { return m_regionLocY; }
@@ -417,8 +432,6 @@ namespace OpenSim.Services.Interfaces
 
             if (kvp.ContainsKey("Token"))
                 Token = kvp["Token"].ToString();
-
         }
     }
-
 }
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs
index 7e7391c..a85ee70 100644
--- a/OpenSim/Services/MapImageService/MapImageService.cs
+++ b/OpenSim/Services/MapImageService/MapImageService.cs
@@ -138,6 +138,8 @@ namespace OpenSim.Services.MapImageService
 
         public byte[] GetMapTile(string fileName, out string format)
         {
+//            m_log.DebugFormat("[MAP IMAGE SERVICE]: Getting map tile {0}", fileName);
+
             format = ".jpg";
             string fullName = Path.Combine(m_TilesStoragePath, fileName);
             if (File.Exists(fullName))
@@ -206,7 +208,7 @@ namespace OpenSim.Services.MapImageService
 
         private bool CreateTile(uint zoomLevel, int x, int y)
         {
-            m_log.DebugFormat("[MAP IMAGE SERVICE]: Create tile for {0} {1}, zoom {2}", x, y, zoomLevel);
+//            m_log.DebugFormat("[MAP IMAGE SERVICE]: Create tile for {0} {1}, zoom {2}", x, y, zoomLevel);
             int prevWidth = (int)Math.Pow(2, (double)zoomLevel - 2);
             int thisWidth = (int)Math.Pow(2, (double)zoomLevel - 1);