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

1 files changed, 8 insertions, 4 deletions

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");