diff options
author | Michael Cerquoni | 2014-03-19 11:16:52 -0400 |
---|---|---|
committer | Michael Cerquoni | 2014-03-19 11:16:52 -0400 |
commit | b5f94c72b9a87237019ae6bff9e095bd2e0e29ef (patch) | |
tree | 5f8ba9d5239a5522948d8149b519a92235a7f6de /OpenSim/Region/CoreModules/World/LegacyMap | |
parent | Add Jak Daniels to CONTRIBUTORS.TXT (diff) | |
download | opensim-SC_OLD-b5f94c72b9a87237019ae6bff9e095bd2e0e29ef.zip opensim-SC_OLD-b5f94c72b9a87237019ae6bff9e095bd2e0e29ef.tar.gz opensim-SC_OLD-b5f94c72b9a87237019ae6bff9e095bd2e0e29ef.tar.bz2 opensim-SC_OLD-b5f94c72b9a87237019ae6bff9e095bd2e0e29ef.tar.xz |
Allow MaptileStaticFile path to be set to anywhere and not force it to bin/maptiles
Diffstat (limited to 'OpenSim/Region/CoreModules/World/LegacyMap')
-rw-r--r-- | OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
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 | |||
122 | { | 122 | { |
123 | try | 123 | try |
124 | { | 124 | { |
125 | mapbmp = new Bitmap("maptiles/" + m_scene.RegionInfo.m_maptileStaticFile); | 125 | mapbmp = new Bitmap(m_scene.RegionInfo.m_maptileStaticFile); |
126 | } | 126 | } |
127 | catch (Exception e) | 127 | catch (Exception e) |
128 | { | 128 | { |
129 | m_log.ErrorFormat("[MAPTILE]: Failed to load Static map image texture file: {0} for {1}", "maptiles/" + m_scene.RegionInfo.m_maptileStaticFile, m_scene.Name); | 129 | m_log.ErrorFormat("[MAPTILE]: Failed to load Static map image texture file: {0} for {1}", m_scene.RegionInfo.m_maptileStaticFile, m_scene.Name); |
130 | //mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height, System.Drawing.Imaging.PixelFormat.Format24bppRgb); | 130 | //mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height, System.Drawing.Imaging.PixelFormat.Format24bppRgb); |
131 | mapbmp = null; | 131 | mapbmp = null; |
132 | } | 132 | } |
133 | 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); | 133 | if (mapbmp != null) m_log.DebugFormat("[MAPTILE]: Static map image texture file {0} found for {1}", m_scene.RegionInfo.m_maptileStaticFile, m_scene.Name); |
134 | } | 134 | } |
135 | } | 135 | } |
136 | else | 136 | else |