From 54e6b2402c280b775c3ad8cba04e118bd8b57bda Mon Sep 17 00:00:00 2001 From: BlueWall Date: Mon, 30 Jan 2012 12:39:08 -0500 Subject: Revert "Pickup map overlay tile from RegionSettings.ParcelImageID" This reverts commit 00d1c88c59c10aa8d34fa36910cf0f1f0e9878b8. Need to dig a little deeper to see exactly how V1 viewers are using this --- OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index bbf6b05..eac2743 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs @@ -1026,7 +1026,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap protected void MapBlockFromGridRegion(MapBlockData block, GridRegion r) { block.Access = r.Access; - block.MapImageId = m_scene.RegionInfo.RegionSettings.ParcelImageID; + block.MapImageId = r.TerrainImage; block.Name = r.RegionName; block.X = (ushort)(r.RegionLocX / Constants.RegionSize); block.Y = (ushort)(r.RegionLocY / Constants.RegionSize); -- cgit v1.1