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 +++---
 bin/Regions/Regions.ini.example                              | 5 +++--
 2 files changed, 6 insertions(+), 5 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
                 {
                     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
diff --git a/bin/Regions/Regions.ini.example b/bin/Regions/Regions.ini.example
index 57d503e..36ccd8c 100644
--- a/bin/Regions/Regions.ini.example
+++ b/bin/Regions/Regions.ini.example
@@ -66,7 +66,7 @@ ExternalHostName = "SYSTEMIP"
 
 ; * Region Specific Static Maptiles from file:
 ; * It is also possible to create maptiles using external image files of the right size
-; * and supported formats (bmp,tga,png,jpg in RGB 24bpp format)
+; * and supported formats (bmp,png,jpg in RGB 24bpp format)
 ; *
 ; * Important: To use any kind of texture *files* as a static maptile, the following
 ; * things must be set in the [Map] section of OpenSim.ini :
@@ -76,7 +76,8 @@ ExternalHostName = "SYSTEMIP"
 ; *
 ; * The image must be the same size in pixels as the region or varregion is in meters.
 ; * i.e. 256x256 pixels for single region of 256x256m, or 1280x1280 pixels for a varregion
-; * of size 1280x1280m. The image is loaded from OpenSim's bin/maptiles/ directory.
+; * of size 1280x1280m. The image can be loaded from anywhere by setting the path 
+; *                                ie: MaptileStaticFile = "maptiles/SomeFile.png"
 ; *
 ; * If this setting is used, then the base map is generated from this file instead of being
 ; * built using MapImageModule's terrain and prim renderer. Parcel 'for sale' overlays are
-- 
cgit v1.1