From bde2ff5e78360061be89e4c5717f4d67248d9185 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 30 Jan 2012 20:11:47 +0000
Subject: Next step for world map overlays

---
 OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 103d128..c81eeeb 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -263,7 +263,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                         foreach (GridRegion r in regions)
                         {
                             MapBlockData block = new MapBlockData();
-                            MapBlockFromGridRegion(block, r);
+                            MapBlockFromGridRegion(block, r, 0);
                             mapBlocks.Add(block);
                         }
                         avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0);
@@ -990,7 +990,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     response.Add(block);
                 }
                 // The lower 16 bits are an unsigned int16
-                remoteClient.SendMapBlock(response, flags & 0xffff);
+                remoteClient.SendMapBlock(response, flag & 0xffff);
             }
             else
             {
@@ -1031,6 +1031,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 break;
             default:
                 block.MapImageId = UUID.Zero;
+                break;
             }
             block.Name = r.RegionName;
             block.X = (ushort)(r.RegionLocX / Constants.RegionSize);
-- 
cgit v1.1