aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2012-01-30 21:38:46 +0000
committerMelanie2012-01-30 21:39:12 +0000
commit2b84b6d8b1216d01aef4ad5fad513176e0867c6d (patch)
tree0b635032c91a63388f53ba30d6f81d1fbdce2f97 /OpenSim
parentPatch in the rest of the maptile stuff (diff)
downloadopensim-SC_OLD-2b84b6d8b1216d01aef4ad5fad513176e0867c6d.zip
opensim-SC_OLD-2b84b6d8b1216d01aef4ad5fad513176e0867c6d.tar.gz
opensim-SC_OLD-2b84b6d8b1216d01aef4ad5fad513176e0867c6d.tar.bz2
opensim-SC_OLD-2b84b6d8b1216d01aef4ad5fad513176e0867c6d.tar.xz
Use the requested sim's map, not our own
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs4
1 files changed, 2 insertions, 2 deletions
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
1024 switch (flag & 0xffff) 1024 switch (flag & 0xffff)
1025 { 1025 {
1026 case 0: 1026 case 0:
1027 block.MapImageId = m_scene.RegionInfo.RegionSettings.ParcelImageID; 1027 block.MapImageId = r.TerrainImage;
1028 break; 1028 break;
1029 case 2: 1029 case 2:
1030 block.MapImageId = m_scene.RegionInfo.RegionSettings.ParcelImageID; 1030 block.MapImageId = r.ParcelImage;
1031 break; 1031 break;
1032 default: 1032 default:
1033 block.MapImageId = UUID.Zero; 1033 block.MapImageId = UUID.Zero;