Merge branch 'master' into careminster-presence-refactor

author: Melanie 2010-07-04 11:02:21 +0100
committer: Melanie 2010-07-04 11:02:21 +0100
commit: 8a45191aa9834623cb69f17a3855a730648e89c2 (patch)
tree: fcc5815839a9b67d915528f6e4510f3af2fa2faa /OpenSim/Region/CoreModules
parent: Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parent: Fixes the obvious problem in mantis #4841. Melanie needs to look at other pot... (diff)
download: opensim-SC-8a45191aa9834623cb69f17a3855a730648e89c2.zip
opensim-SC-8a45191aa9834623cb69f17a3855a730648e89c2.tar.gz
opensim-SC-8a45191aa9834623cb69f17a3855a730648e89c2.tar.bz2
opensim-SC-8a45191aa9834623cb69f17a3855a730648e89c2.tar.xz
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
                    imgstream = new MemoryStream();
                    // non-async because we know we have the asset immediately.
-                    AssetBase mapasset = m_scene.AssetService.Get(m_scene.RegionInfo.lastMapUUID.ToString());
+                    AssetBase mapasset = m_scene.AssetService.Get(m_scene.RegionInfo.RegionSettings.TerrainImageID.ToString());
                    // Decode image to System.Drawing.Image
                    if (OpenJPEG.DecodeToImage(mapasset.Data, out managedImage, out image))
author	Melanie	2010-07-04 11:02:21 +0100
committer	Melanie	2010-07-04 11:02:21 +0100
commit	8a45191aa9834623cb69f17a3855a730648e89c2 (patch)
tree	fcc5815839a9b67d915528f6e4510f3af2fa2faa /OpenSim/Region/CoreModules
parent	Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parent	Fixes the obvious problem in mantis #4841. Melanie needs to look at other pot... (diff)
download	opensim-SC-8a45191aa9834623cb69f17a3855a730648e89c2.zip opensim-SC-8a45191aa9834623cb69f17a3855a730648e89c2.tar.gz opensim-SC-8a45191aa9834623cb69f17a3855a730648e89c2.tar.bz2 opensim-SC-8a45191aa9834623cb69f17a3855a730648e89c2.tar.xz

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))