From fe8977564bda8ec2f328ebb2d2623c43073e9be5 Mon Sep 17 00:00:00 2001
From: onefang
Date: Thu, 22 Aug 2019 12:01:47 +1000
Subject: When the generate map command is given, generate the map.

The month check seems a bit dodgy, but I'll let it ride for now.
---
 .../Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/World/Warp3DMap')

diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
index fb94853..d094bee 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -245,10 +245,20 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             g.Flush();
         }
 */
+        public Bitmap CreateMapTileForce()
+        {
+            m_log.Info("[MAPTILE]: Forcing a map tile regenerate.");
+            File.Delete(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp"));
+            return CreateMapTile();
+        }
         public Bitmap CreateMapTile()
         {
-            if ((File.GetCreationTime(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp")).Month != DateTime.Now.Month) && m_enable_refreshEveryMonth == true)
+            if ((File.GetCreationTime(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp")).Month != DateTime.Now.Month) && (m_enable_refreshEveryMonth == true))
+            {
+                m_log.InfoFormat("[MAPTILE]: Clearing old map tile out of cache {0} {1}.", 
+                    File.GetCreationTime(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp")).Month, DateTime.Now.Month);
                 File.Delete(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp"));
+            }
 
             if(File.Exists(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp")))
             {
@@ -256,6 +266,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             }
             else
             {
+                m_log.Info("[MAPTILE]: Actually generating a map tile.");
                 /* this must be on all map, not just its image
                 if ((DateTime.Now - lastImageTime).TotalSeconds < 3600)
                 {
-- 
cgit v1.1