aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-03-26 20:58:58 +0000
committerJustin Clark-Casey (justincc)2014-03-26 20:58:58 +0000
commitb0bae62c30323ed42a68de341998e5dc722bb199 (patch)
treecf91e3bdf4aee25fa9d8088dea3b4fa9d418ebee /OpenSim/Region
parentAdd MSSQL EstateStore.migrations VERSION 10 transaction to add AllowLandMark,... (diff)
downloadopensim-SC_OLD-b0bae62c30323ed42a68de341998e5dc722bb199.zip
opensim-SC_OLD-b0bae62c30323ed42a68de341998e5dc722bb199.tar.gz
opensim-SC_OLD-b0bae62c30323ed42a68de341998e5dc722bb199.tar.bz2
opensim-SC_OLD-b0bae62c30323ed42a68de341998e5dc722bb199.tar.xz
refactor: Actually use MaptileStaticFile in RegionInfo rather than having both a public field and a get property
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs14
1 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
index 556b11f..b00620e 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
91 91
92 if (generateMaptiles) 92 if (generateMaptiles)
93 { 93 {
94 if (String.IsNullOrEmpty(m_scene.RegionInfo.m_maptileStaticFile)) 94 if (String.IsNullOrEmpty(m_scene.RegionInfo.MaptileStaticFile))
95 { 95 {
96 if (textureTerrain) 96 if (textureTerrain)
97 { 97 {
@@ -122,15 +122,21 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
122 { 122 {
123 try 123 try
124 { 124 {
125 mapbmp = new Bitmap(m_scene.RegionInfo.m_maptileStaticFile); 125 mapbmp = new Bitmap(m_scene.RegionInfo.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}", m_scene.RegionInfo.m_maptileStaticFile, m_scene.Name); 129 m_log.ErrorFormat(
130 "[MAPTILE]: Failed to load Static map image texture file: {0} for {1}",
131 m_scene.RegionInfo.MaptileStaticFile, m_scene.Name);
130 //mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height, System.Drawing.Imaging.PixelFormat.Format24bppRgb); 132 //mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height, System.Drawing.Imaging.PixelFormat.Format24bppRgb);
131 mapbmp = null; 133 mapbmp = null;
132 } 134 }
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); 135
136 if (mapbmp != null)
137 m_log.DebugFormat(
138 "[MAPTILE]: Static map image texture file {0} found for {1}",
139 m_scene.RegionInfo.MaptileStaticFile, m_scene.Name);
134 } 140 }
135 } 141 }
136 else 142 else