OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow MaptileStaticFile path to be set to anywhere and not force it to bin/maptiles

0.8.0.3
Michael Cerquoni 2014-03-19 11:16:52 -04:00
parent 220ea9f687
commit b5f94c72b9
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
View File

@ -122,15 +122,15 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
{ {
try try
{ {
mapbmp = new Bitmap("maptiles/" + m_scene.RegionInfo.m_maptileStaticFile); mapbmp = new Bitmap(m_scene.RegionInfo.m_maptileStaticFile);
} }
catch (Exception e) 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 = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height, System.Drawing.Imaging.PixelFormat.Format24bppRgb);
mapbmp = null; 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 else

5
bin/Regions/Regions.ini.example
View File

@ -66,7 +66,7 @@ ExternalHostName = "SYSTEMIP"
; * Region Specific Static Maptiles from file: ; * Region Specific Static Maptiles from file:
; * It is also possible to create maptiles using external image files of the right size ; * 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 ; * 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 : ; * 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. ; * 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 ; * 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 ; * 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 ; * built using MapImageModule's terrain and prim renderer. Parcel 'for sale' overlays are