diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 2184a59..bf18616 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -89,11 +89,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
89 | #region INonSharedRegionModule Members | 89 | #region INonSharedRegionModule Members |
90 | public virtual void Initialise (IConfigSource config) | 90 | public virtual void Initialise (IConfigSource config) |
91 | { | 91 | { |
92 | IConfig startupConfig = config.Configs["Startup"]; | 92 | string[] configSections = new string[] { "Map", "Startup" }; |
93 | if (startupConfig.GetString("WorldMapModule", "WorldMap") == "WorldMap") | ||
94 | m_Enabled = true; | ||
95 | 93 | ||
96 | blacklistTimeout = startupConfig.GetInt("BlacklistTimeout", 10*60) * 1000; | 94 | if (Util.GetConfigVarFromSections<string>( |
95 | config, "WorldMapModule", configSections, "WorldMap") == "WorldMap") | ||
96 | m_Enabled = true; | ||
97 | |||
98 | blacklistTimeout | ||
99 | = Util.GetConfigVarFromSections<int>(config, "BlacklistTimeout", configSections, 10 * 60) * 1000; | ||
97 | } | 100 | } |
98 | 101 | ||
99 | public virtual void AddRegion (Scene scene) | 102 | public virtual void AddRegion (Scene scene) |