Merge pull request #51 from typhartez/maptiles-path

Add MapTilesDirectory setting to configure map tile location

OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs

@@ -84,6 +84,8 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         private float m_renderMinHeight = -100f;
         private float m_renderMaxHeight = 4096f;
 
+        private string m_mapTilesDirectory = string.Empty; // directory to load/save map tile images
+
         private bool m_Enabled = false;
 
         #region Region Module interface
@@ -132,6 +134,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                 m_renderMinHeight = -100f;
             else if (m_renderMinHeight > m_renderMaxHeight - 10f)
                 m_renderMinHeight = m_renderMaxHeight - 10f;
+
+            m_mapTilesDirectory =
+                Util.GetConfigVarFromSections<string>(source, "MapTilesDirectory", configSections, m_mapTilesDirectory);
         }
 
         public void AddRegion(Scene scene)
@@ -209,6 +214,11 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             Bitmap tile = GenImage();
             // image may be reloaded elsewhere, so no compression format
             string filename = "MAP-" + m_scene.RegionInfo.RegionID.ToString() + ".png";
+            if (!string.IsNullOrEmpty(m_mapTilesDirectory))
+            {
+                Directory.CreateDirectory(m_mapTilesDirectory);
+                filename = System.IO.Path.Combine(m_mapTilesDirectory, filename);
+            }
             tile.Save(filename,ImageFormat.Png);
             m_primMesher = null;
             return tile;

OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs

@@ -130,14 +130,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
                 //m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count);
 
-                MapBlockData data;
                 if (regionInfos != null && regionInfos.Count > 0)
                 {
                     foreach (GridRegion info in regionInfos)
                     {
-                        data = new MapBlockData();
-                        data.Agents = 0;
-                        data.Access = info.Access;
                         MapBlockData block = new MapBlockData();
                         MapBlockFromGridRegion(block, info, flags);
 

OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

@@ -100,6 +100,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         protected bool m_exportPrintScale = false; // prints the scale of map in meters on exported map
         protected bool m_exportPrintRegionName = false; // prints the region name exported map
         protected bool m_localV1MapAssets = false; // keep V1 map assets only on  local cache
+        protected string m_mapTilesDirectory = string.Empty; // directory to load/save map tile images
 
         private readonly object m_sceneLock = new object();
         public WorldMapModule()
@@ -158,6 +159,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 Util.GetConfigVarFromSections<bool>(config, "ExportMapAddRegionName", configSections, m_exportPrintRegionName);
             m_localV1MapAssets =
                 Util.GetConfigVarFromSections<bool>(config, "LocalV1MapAssets", configSections, m_localV1MapAssets);
+            m_mapTilesDirectory =
+                Util.GetConfigVarFromSections<string>(config, "MapTilesDirectory", configSections, m_mapTilesDirectory);
         }
 
         public virtual void AddRegion(Scene scene)
@@ -172,7 +175,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 m_regionGlobalX = scene.RegionInfo.WorldLocX;
                 m_regionGlobalY = scene.RegionInfo.WorldLocY;
                 m_regionSizeX = scene.RegionInfo.RegionSizeX;
-                m_regionSizeY = scene.RegionInfo.RegionSizeX;
+                m_regionSizeY = scene.RegionInfo.RegionSizeY;
                 m_regionName = scene.RegionInfo.RegionName;
 
                 m_scene.RegisterModuleInterface<IWorldMapModule>(this);
@@ -1339,6 +1342,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
             bool doneLocal = false;
             string filename = "MAP-" + m_scene.RegionInfo.RegionID.ToString() + ".png";
+            if (!string.IsNullOrEmpty(m_mapTilesDirectory))
+                filename = Path.Combine(m_mapTilesDirectory, filename);
             try
             {
                 using(Image localMap = Bitmap.FromFile(filename))

OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs

@@ -318,6 +318,9 @@ namespace OpenSim.Region.ScriptEngine.Yengine
                     m_LastRanAt = now;
                     m_InstEHSlice++;
                     callMode = CallMode_NORMAL;
+                    // The script really executes here, so it has meaningful
+                    // state to serialize — GetXMLState gates on this flag.
+                    m_HasRun = true;
                     e = ResumeEx();
                 }
 
@@ -393,6 +396,8 @@ namespace OpenSim.Region.ScriptEngine.Yengine
                     m_DetectParams = evt.DetectParams;
                     m_LastRanAt = now;
                     m_InstEHEvent++;
+                    // Starting a new event handler counts as "has run".
+                    m_HasRun = true;
                     e = StartEventHandler(evc, evt.Params);
                 }
 

bin/OpenSimDefaults.ini

@@ -467,6 +467,11 @@
     ; generate better images.
     ;MapImageModule = "MapImageModule"
 
+    ; Directory used to load and save the generated MAP-<region uuid>.png tile images.
+    ; If left empty the current working directory is used (default behaviour).
+    ; The directory is created automatically if it does not exist.
+    ;MapTilesDirectory = "./maptiles"
+
     ; World map blacklist timeout in seconds
     ;BlacklistTimeout = 600