Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

2 files changed, 37 insertions, 19 deletions

diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
index 1dad8ba..556b11f 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
@@ -91,29 +91,46 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
             if (generateMaptiles)
             {
-                if (textureTerrain)
+                if (String.IsNullOrEmpty(m_scene.RegionInfo.m_maptileStaticFile))
                 {
-                    terrainRenderer = new TexturedMapTileRenderer();
-                }
-                else
-                {
-                    terrainRenderer = new ShadedMapTileRenderer();
-                }
+                    if (textureTerrain)
+                    {
+                        terrainRenderer = new TexturedMapTileRenderer();
+                    }
+                    else
+                    {
+                        terrainRenderer = new ShadedMapTileRenderer();
+                    }
 
-                terrainRenderer.Initialise(m_scene, m_config);
+                    terrainRenderer.Initialise(m_scene, m_config);
 
-                mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height,
-                                        System.Drawing.Imaging.PixelFormat.Format24bppRgb);
-                //long t = System.Environment.TickCount;
-                //for (int i = 0; i < 10; ++i) {
-                terrainRenderer.TerrainToBitmap(mapbmp);
-                //}
-                //t = System.Environment.TickCount - t;
-                //m_log.InfoFormat("[MAPTILE] generation of 10 maptiles needed {0} ms", t);
+                    mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height,
+                                            System.Drawing.Imaging.PixelFormat.Format24bppRgb);
+                    //long t = System.Environment.TickCount;
+                    //for (int i = 0; i < 10; ++i) {
+                    terrainRenderer.TerrainToBitmap(mapbmp);
+                    //}
+                    //t = System.Environment.TickCount - t;
+                    //m_log.InfoFormat("[MAPTILE] generation of 10 maptiles needed {0} ms", t);
 
-                if (drawPrimVolume)
+                    if (drawPrimVolume)
+                    {
+                        DrawObjectVolume(m_scene, mapbmp);
+                    }
+                }
+                else
                 {
-                    DrawObjectVolume(m_scene, mapbmp);
+                    try
+                    {
+                        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}", 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}", m_scene.RegionInfo.m_maptileStaticFile, m_scene.Name);
                 }
             }
             else
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index fa90ef4..d16b73b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -903,7 +903,8 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (m_generateMaptiles)
                 {
-                    int maptileRefresh = startupConfig.GetInt("MaptileRefresh", 0);
+                    int maptileRefresh = Util.GetConfigVarFromSections<int>(config, "MaptileRefresh", possibleMapConfigSections, 0);
+                    m_log.InfoFormat("[SCENE]: Region {0}, WORLD MAP refresh time set to {1} seconds", RegionInfo.RegionName, maptileRefresh);
                     if (maptileRefresh != 0)
                     {
                         m_mapGenerationTimer.Interval = maptileRefresh * 1000;