diff options
| author | Melanie | 2012-01-30 21:38:46 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-30 21:38:46 +0000 |
| commit | e1cad4c34ff7325fbb5ba5f063914ed32ac3323a (patch) | |
| tree | ee93555c3b3a9b582a03bf77c01e779111ba56de /OpenSim/Region | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-e1cad4c34ff7325fbb5ba5f063914ed32ac3323a.zip opensim-SC-e1cad4c34ff7325fbb5ba5f063914ed32ac3323a.tar.gz opensim-SC-e1cad4c34ff7325fbb5ba5f063914ed32ac3323a.tar.bz2 opensim-SC-e1cad4c34ff7325fbb5ba5f063914ed32ac3323a.tar.xz | |
Use the requested sim's map, not our own
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 4 |
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 37296af..552bbe7 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; |