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.
---
 .../CoreModules/World/WorldMap/WorldMapModule.cs   | 24 +++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

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

diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 03a4d34..94072a5 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -1458,7 +1458,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             if (consoleScene != null && consoleScene != m_scene)
                 return;
 
-            GenerateMaptile();
+            GenerateMaptileForce();
         }
 
         public OSD HandleRemoteMapItemRequest(string path, OSD request, string endpoint)
@@ -1572,6 +1572,28 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             return responsemap;
         }
 
+        private void GenerateMaptileForce()
+        {
+            // Cannot create a map for a nonexistent heightmap
+            if (m_scene.Heightmap == null)
+                return;
+
+            if (m_mapImageGenerator == null)
+            {
+                Console.WriteLine("No map image generator available for {0}", m_scene.Name);
+                return;
+            }
+            m_log.DebugFormat("[WORLD MAP]: Generating map image for {0}", m_scene.Name);
+
+            using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTileForce())
+            {
+                GenerateMaptile(mapbmp);
+
+                if (m_mapImageServiceModule != null)
+                    m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
+            }
+        }
+
         public void GenerateMaptile()
         {
             // Cannot create a map for a nonexistent heightmap
-- 
cgit v1.1