From 2b84b6d8b1216d01aef4ad5fad513176e0867c6d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 30 Jan 2012 21:38:46 +0000
Subject: Use the requested sim's map, not our own

---
 OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 4 ++--
 1 file changed, 2 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 ac95598..e42c946 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -1024,10 +1024,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             switch (flag & 0xffff)
             {
             case 0:
-                block.MapImageId = m_scene.RegionInfo.RegionSettings.ParcelImageID;
+                block.MapImageId = r.TerrainImage;
                 break;
             case 2:
-                block.MapImageId = m_scene.RegionInfo.RegionSettings.ParcelImageID;
+                block.MapImageId = r.ParcelImage;
                 break;
             default:
                 block.MapImageId = UUID.Zero;
-- 
cgit v1.1