aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-24 22:24:10 +0000
committerMelanie Thielker2008-09-24 22:24:10 +0000
commit9131ba23e1f8a52127b5a5b069d5237ca6d662ea (patch)
treead570769eaae5d985896a5e7c77f3715d6a6cbe7
parentCorrect a capitalization error (diff)
downloadopensim-SC_OLD-9131ba23e1f8a52127b5a5b069d5237ca6d662ea.zip
opensim-SC_OLD-9131ba23e1f8a52127b5a5b069d5237ca6d662ea.tar.gz
opensim-SC_OLD-9131ba23e1f8a52127b5a5b069d5237ca6d662ea.tar.bz2
opensim-SC_OLD-9131ba23e1f8a52127b5a5b069d5237ca6d662ea.tar.xz
Add a module selection option for the MapImage Module as well
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs6
-rw-r--r--bin/OpenSim.ini.example1
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
134 { 134 {
135 m_scene = scene; 135 m_scene = scene;
136 m_config = source; 136 m_config = source;
137
138 IConfig startupConfig = m_config.Configs["Startup"];
139 if (startupConfig.GetString("MapImageModule", "MapImageModule") !=
140 "MapImageModule")
141 return;
142
137 m_scene.RegisterModuleInterface<IMapImageGenerator>(this); 143 m_scene.RegisterModuleInterface<IMapImageGenerator>(this);
138 } 144 }
139 145
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"
115; ## 115; ##
116 116
117;WorldMapModule = "WorldMap" 117;WorldMapModule = "WorldMap"
118;MapImageModule = "MapImageModule"
118 119
119[StandAlone] 120[StandAlone]
120accounts_authenticate = true 121accounts_authenticate = true