2 files changed, 12 insertions, 6 deletions

diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index b270de9..c7bd3d0 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -963,10 +963,10 @@ namespace OpenSim.Region.CoreModules.Asset
                     case "assets":
                         con.Output("Ensuring assets are cached for all scenes.");
 
-                        Util.FireAndForget(delegate {
+                        Util.RunThreadNoTimeout(delegate {
                             int assetReferenceTotal = TouchAllSceneAssets(true);
                             con.OutputFormat("Completed check with {0} assets.", assetReferenceTotal);
-                        });
+                        }, "TouchAllSceneAssets", null);
 
                         break;
 
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