diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 15f522df20..f8a563641d 100755
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -12163,7 +12163,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         }
 
                         m_lastMapRegenTime = Double.MaxValue;
-                        mapModule.GenerateMaptile();
+                        ((Scene)Scene).RegenerateMaptileAndReregister(this, null);
                         SendAlertMessage("Terrain map generated");
                         m_lastMapRegenTime = now;
                     }
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index e7b9cb5c8f..1dab18e368 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -1545,7 +1545,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             if (consoleScene != null && consoleScene != m_scene)
                 return;
 
-            GenerateMaptile();
+            m_scene.RegenerateMaptileAndReregister(this, null);
         }
 
         public OSD HandleRemoteMapItemRequest(string path, OSD request, string endpoint)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 377ba297f7..03f46bbe8f 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1040,7 +1040,7 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         m_mapGenerationTimer.Interval = maptileRefresh * 1000;
                         m_mapGenerationTimer.Elapsed += RegenerateMaptileAndReregister;
-                        m_mapGenerationTimer.AutoReset = true;
+                        m_mapGenerationTimer.AutoReset = false;
                         m_mapGenerationTimer.Start();
                     }
                 }
@@ -6026,7 +6026,9 @@ Environment.Exit(1);
             // so that all simulators can retrieve it
             string error = GridService.RegisterRegion(RegionInfo.ScopeID, new GridRegion(RegionInfo));
             if (error != string.Empty)
-            throw new Exception(error);
+                throw new Exception(error);
+            if(m_generateMaptiles)
+                m_mapGenerationTimer.Start();
         }
 
         /// <summary>