HGWorldMap got a bit out of sync during the introduction of the new module system. Should work now. Fixes mantis #3533.

2 files changed, 15 insertions, 100 deletions

diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index 6143c87..440765a 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -51,39 +51,6 @@ namespace OpenSim.Region.CoreModules.Hypergrid
                 m_Enabled = true;
         }
 
-        public override void AddRegion(Scene scene)
-        {
-            if (!m_Enabled)
-                return;
-
-            m_log.Info("[HGMap] Initializing...");
-            lock (scene)
-            {
-                m_scene = scene;
-
-                m_scene.RegisterModuleInterface<IWorldMapModule>(this);
-
-                m_scene.AddCommand(
-                    this, "export-map",
-                    "export-map [<path>]",
-                    "Save an image of the world map", HandleExportWorldMapConsoleCommand);
-            }
-        }
-
-        public override void RemoveRegion(Scene scene)
-        {
-            if (!m_Enabled)
-                return;
-
-            lock (m_scene)
-            {
-                m_Enabled = false;
-                m_scene.UnregisterModuleInterface<IWorldMapModule>(this);
-                // TODO: m_scene.RemoveCommand(this, "export-map");
-                m_scene = null;
-            }
-        }
-
         public override string Name
         {
             get { return "HGWorldMap"; }
@@ -91,74 +58,18 @@ namespace OpenSim.Region.CoreModules.Hypergrid
 
         #endregion
 
-        /// <summary>
-        /// Requests map blocks in area of minX, maxX, minY, MaxY in world cordinates
-        /// </summary>
-        /// <param name="minX"></param>
-        /// <param name="minY"></param>
-        /// <param name="maxX"></param>
-        /// <param name="maxY"></param>
-        public override void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
+        protected override void GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
         {
-            //
-            // WARNING!!! COPY & PASTE FROM SUPERCLASS
-            // The only difference is at the very end
-            //
-
-            m_log.Info("[HGMap]: Request map blocks " + minX + "-" + maxX + " " + minY + "-" + maxY);
+            List<MapBlockData> mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, maxX + 4, maxY + 4);
 
-            //m_scene.ForEachScenePresence(delegate (ScenePresence sp) {
-            //    if (!sp.IsChildAgent && sp.UUID == remoteClient.AgentId)
-            //    {
-            //        m_log.Debug("XXX Root agent");
-            //        DoRequestMapBlocks(remoteClient, minX, minY, maxX, maxY, flag);
-            //    }
-            //};
-
-            List<MapBlockData> mapBlocks;
-            if ((flag & 0x10000) != 0)  // user clicked on the map a tile that isn't visible
-            {
-                List<MapBlockData> response = new List<MapBlockData>();
-
-                // this should return one mapblock at most. But make sure: Look whether the one we requested is in there
-                mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
-                if (mapBlocks != null)
-                {
-                    foreach (MapBlockData block in mapBlocks)
-                    {
-                        if (block.X == minX && block.Y == minY)
-                        {
-                            // found it => add it to response
-                            response.Add(block);
-                            break;
-                        }
-                    }
-                }
-
-                if (response.Count == 0)
-                {
-                    // response still empty => couldn't find the map-tile the user clicked on => tell the client
-                    MapBlockData block = new MapBlockData();
-                    block.X = (ushort)minX;
-                    block.Y = (ushort)minY;
-                    block.Access = 254; // == not there
-                    response.Add(block);
-                }
-                remoteClient.SendMapBlock(response, 0);
-            }
-            else
-            {
-                // normal mapblock request. Use the provided values
-                mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, maxX + 4, maxY + 4);
-
-                // Different from super
-                FillInMap(mapBlocks, minX, minY, maxX, maxY);
-                //
+            // Different from super
+            FillInMap(mapBlocks, minX, minY, maxX, maxY);
+            //
 
-                remoteClient.SendMapBlock(mapBlocks, flag);
-            }
+            remoteClient.SendMapBlock(mapBlocks, flag);
         }
 
+
         private void FillInMap(List<MapBlockData> mapBlocks, int minX, int minY, int maxX, int maxY)
         {
             for (int x = minX; x <= maxX; x++)
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 75b5a85..d4e7bb6 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -709,13 +709,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         /// <param name="maxY"></param>
         public virtual void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
         {
-            List<MapBlockData> mapBlocks;
             if ((flag & 0x10000) != 0)  // user clicked on the map a tile that isn't visible
             {
                 List<MapBlockData> response = new List<MapBlockData>();
 
                 // this should return one mapblock at most. But make sure: Look whether the one we requested is in there
-                mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
+                List<MapBlockData> mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks(minX, minY, maxX, maxY);
                 if (mapBlocks != null)
                 {
                     foreach (MapBlockData block in mapBlocks)
@@ -743,11 +742,16 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             else
             {
                 // normal mapblock request. Use the provided values
-                mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, maxX + 4, maxY + 4);
-                remoteClient.SendMapBlock(mapBlocks, flag);
+                GetAndSendBlocks(remoteClient, minX, minY, maxX, maxY, flag);
             }
         }
 
+        protected virtual void GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
+        {
+            List<MapBlockData> mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, maxX + 4, maxY + 4);
+            remoteClient.SendMapBlock(mapBlocks, flag);
+        }
+
         public Hashtable OnHTTPGetMapImage(Hashtable keysvals)
         {
             m_log.Debug("[WORLD MAP]: Sending map image jpeg");