From b0bae62c30323ed42a68de341998e5dc722bb199 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 26 Mar 2014 20:58:58 +0000 Subject: refactor: Actually use MaptileStaticFile in RegionInfo rather than having both a public field and a get property --- .../Region/CoreModules/World/LegacyMap/MapImageModule.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region') 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 if (generateMaptiles) { - if (String.IsNullOrEmpty(m_scene.RegionInfo.m_maptileStaticFile)) + if (String.IsNullOrEmpty(m_scene.RegionInfo.MaptileStaticFile)) { if (textureTerrain) { @@ -122,15 +122,21 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap { try { - mapbmp = new Bitmap(m_scene.RegionInfo.m_maptileStaticFile); + mapbmp = new Bitmap(m_scene.RegionInfo.MaptileStaticFile); } catch (Exception e) { - m_log.ErrorFormat("[MAPTILE]: Failed to load Static map image texture file: {0} for {1}", 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.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}", 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.MaptileStaticFile, m_scene.Name); } } else -- cgit v1.1