diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs | 6 | ||||
-rw-r--r-- | 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 | |||
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 |
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" | |||
66 | 66 | ||
67 | ; * Region Specific Static Maptiles from file: | 67 | ; * Region Specific Static Maptiles from file: |
68 | ; * It is also possible to create maptiles using external image files of the right size | 68 | ; * It is also possible to create maptiles using external image files of the right size |
69 | ; * and supported formats (bmp,tga,png,jpg in RGB 24bpp format) | 69 | ; * and supported formats (bmp,png,jpg in RGB 24bpp format) |
70 | ; * | 70 | ; * |
71 | ; * Important: To use any kind of texture *files* as a static maptile, the following | 71 | ; * Important: To use any kind of texture *files* as a static maptile, the following |
72 | ; * things must be set in the [Map] section of OpenSim.ini : | 72 | ; * things must be set in the [Map] section of OpenSim.ini : |
@@ -76,7 +76,8 @@ ExternalHostName = "SYSTEMIP" | |||
76 | ; * | 76 | ; * |
77 | ; * The image must be the same size in pixels as the region or varregion is in meters. | 77 | ; * The image must be the same size in pixels as the region or varregion is in meters. |
78 | ; * i.e. 256x256 pixels for single region of 256x256m, or 1280x1280 pixels for a varregion | 78 | ; * i.e. 256x256 pixels for single region of 256x256m, or 1280x1280 pixels for a varregion |
79 | ; * of size 1280x1280m. The image is loaded from OpenSim's bin/maptiles/ directory. | 79 | ; * of size 1280x1280m. The image can be loaded from anywhere by setting the path |
80 | ; * ie: MaptileStaticFile = "maptiles/SomeFile.png" | ||
80 | ; * | 81 | ; * |
81 | ; * If this setting is used, then the base map is generated from this file instead of being | 82 | ; * If this setting is used, then the base map is generated from this file instead of being |
82 | ; * built using MapImageModule's terrain and prim renderer. Parcel 'for sale' overlays are | 83 | ; * built using MapImageModule's terrain and prim renderer. Parcel 'for sale' overlays are |