Don't register a region twice on both official registration and maptile regeneration.

Maptile storage appears orthogonal to region registration

3 files changed, 6 insertions, 1 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/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 05cfe5f..768e4e1 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)))
             {
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs
index 7e7391c..83727b6 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))