aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorDiva Canto2010-07-02 06:35:38 -0700
committerDiva Canto2010-07-02 06:35:38 -0700
commit490f1c144c4e0159b9fb1f130134f8abdab98d81 (patch)
treef119305af3d80dd88d00f9d9c4085d24a468b059 /OpenSim/Region/CoreModules
parentminor: comment out high volume texture serving module debug message (diff)
downloadopensim-SC_OLD-490f1c144c4e0159b9fb1f130134f8abdab98d81.zip
opensim-SC_OLD-490f1c144c4e0159b9fb1f130134f8abdab98d81.tar.gz
opensim-SC_OLD-490f1c144c4e0159b9fb1f130134f8abdab98d81.tar.bz2
opensim-SC_OLD-490f1c144c4e0159b9fb1f130134f8abdab98d81.tar.xz
Fixes mantis #4782
Diffstat (limited to 'OpenSim/Region/CoreModules')
-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 0e849e5..9d9967a 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -805,7 +805,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
805 imgstream = new MemoryStream(); 805 imgstream = new MemoryStream();
806 806
807 // non-async because we know we have the asset immediately. 807 // non-async because we know we have the asset immediately.
808 AssetBase mapasset = m_scene.AssetService.Get(m_scene.RegionInfo.lastMapUUID.ToString()); 808 AssetBase mapasset = m_scene.AssetService.Get(m_scene.RegionInfo.RegionSettings.TerrainImageID.ToString());
809 809
810 // Decode image to System.Drawing.Image 810 // Decode image to System.Drawing.Image
811 if (OpenJPEG.DecodeToImage(mapasset.Data, out managedImage, out image)) 811 if (OpenJPEG.DecodeToImage(mapasset.Data, out managedImage, out image))