From b5f94c72b9a87237019ae6bff9e095bd2e0e29ef Mon Sep 17 00:00:00 2001 From: Michael Cerquoni Date: Wed, 19 Mar 2014 11:16:52 -0400 Subject: Allow MaptileStaticFile path to be set to anywhere and not force it to bin/maptiles --- OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs') diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs index 0bd6ae4..556b11f 100644 --- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs +++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs @@ -122,15 +122,15 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap { try { - mapbmp = new Bitmap("maptiles/" + m_scene.RegionInfo.m_maptileStaticFile); + mapbmp = new Bitmap(m_scene.RegionInfo.m_maptileStaticFile); } catch (Exception e) { - m_log.ErrorFormat("[MAPTILE]: Failed to load Static map image texture file: {0} for {1}", "maptiles/" + m_scene.RegionInfo.m_maptileStaticFile, m_scene.Name); + m_log.ErrorFormat("[MAPTILE]: Failed to load Static map image texture file: {0} for {1}", m_scene.RegionInfo.m_maptileStaticFile, m_scene.Name); //mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height, System.Drawing.Imaging.PixelFormat.Format24bppRgb); mapbmp = null; } - if (mapbmp != null) m_log.DebugFormat("[MAPTILE]: Static map image texture file {0} found for {1}", "maptiles/" + m_scene.RegionInfo.m_maptileStaticFile, m_scene.Name); + if (mapbmp != null) m_log.DebugFormat("[MAPTILE]: Static map image texture file {0} found for {1}", m_scene.RegionInfo.m_maptileStaticFile, m_scene.Name); } } else -- cgit v1.1