2 files changed, 7 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs
index cfbe5ae..556b843 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs
@@ -134,6 +134,12 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
         {
             m_scene = scene;
             m_config = source;
+
+            IConfig startupConfig = m_config.Configs["Startup"];
+            if (startupConfig.GetString("MapImageModule", "MapImageModule") !=
+                    "MapImageModule")
+                return;
+
             m_scene.RegisterModuleInterface<IMapImageGenerator>(this);
         }
 
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index ef27fca..229dbd6 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -115,6 +115,7 @@ DefaultScriptEngine = "DotNetEngine"
 ; ##
 
 ;WorldMapModule = "WorldMap"
+;MapImageModule = "MapImageModule"
 
 [StandAlone]
 accounts_authenticate = true