aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorBlueWall2012-01-30 12:39:08 -0500
committerBlueWall2012-01-30 12:39:08 -0500
commit54e6b2402c280b775c3ad8cba04e118bd8b57bda (patch)
treeff35c3deffdc26b10f34716651b9a9f365cc1b5e /OpenSim
parentPickup map overlay tile from RegionSettings.ParcelImageID (diff)
downloadopensim-SC_OLD-54e6b2402c280b775c3ad8cba04e118bd8b57bda.zip
opensim-SC_OLD-54e6b2402c280b775c3ad8cba04e118bd8b57bda.tar.gz
opensim-SC_OLD-54e6b2402c280b775c3ad8cba04e118bd8b57bda.tar.bz2
opensim-SC_OLD-54e6b2402c280b775c3ad8cba04e118bd8b57bda.tar.xz
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
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs2
1 files changed, 1 insertions, 1 deletions
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
1026 protected void MapBlockFromGridRegion(MapBlockData block, GridRegion r) 1026 protected void MapBlockFromGridRegion(MapBlockData block, GridRegion r)
1027 { 1027 {
1028 block.Access = r.Access; 1028 block.Access = r.Access;
1029 block.MapImageId = m_scene.RegionInfo.RegionSettings.ParcelImageID; 1029 block.MapImageId = r.TerrainImage;
1030 block.Name = r.RegionName; 1030 block.Name = r.RegionName;
1031 block.X = (ushort)(r.RegionLocX / Constants.RegionSize); 1031 block.X = (ushort)(r.RegionLocX / Constants.RegionSize);
1032 block.Y = (ushort)(r.RegionLocY / Constants.RegionSize); 1032 block.Y = (ushort)(r.RegionLocY / Constants.RegionSize);