2 files changed, 5 insertions, 3 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
index db3f900..5365b49 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
             if (config == null)
                 return;
 
-            int refreshminutes = Convert.ToInt32(config.GetString("RefreshTime", "-1"));
+            int refreshminutes = Convert.ToInt32(config.GetString("RefreshTime", "60"));
             if (refreshminutes < 0)
             {
                 m_log.WarnFormat("[MAP IMAGE SERVICE MODULE]: Negative refresh time given in config. Module disabled.");
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index b6d96ac..adcad03 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -1426,7 +1426,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile())
             {
                 GenerateMaptile(mapbmp);
-                m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
+                if(m_mapImageServiceModule != null)
+                    m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
             }
         }
 
@@ -1562,7 +1563,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 GenerateMaptile(mapbmp);
 
                 // v2/3 (MapImageServiceModule)
-                m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
+                if(m_mapImageServiceModule !=null)
+                    m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
             }
         }