aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Hypergrid
diff options
context:
space:
mode:
authorDiva Canto2013-02-25 16:28:12 -0800
committerDiva Canto2013-02-25 16:28:12 -0800
commita356978c794c4a5b0bac4d6a05bf8534885edc68 (patch)
tree6b670d7e458aab7feff4d804a14c3a47e04d91f9 /OpenSim/Region/CoreModules/Hypergrid
parentMantis #6552 -- stricter error (crash) if server URL is malformed. (diff)
parentMove map related settings from [Startup] to a new [Map] section in OpenSim.ini (diff)
downloadopensim-SC-a356978c794c4a5b0bac4d6a05bf8534885edc68.zip
opensim-SC-a356978c794c4a5b0bac4d6a05bf8534885edc68.tar.gz
opensim-SC-a356978c794c4a5b0bac4d6a05bf8534885edc68.tar.bz2
opensim-SC-a356978c794c4a5b0bac4d6a05bf8534885edc68.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Hypergrid')
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index e0921ad..c4255b9 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -52,8 +52,8 @@ namespace OpenSim.Region.CoreModules.Hypergrid
52 52
53 public override void Initialise(IConfigSource config) 53 public override void Initialise(IConfigSource config)
54 { 54 {
55 IConfig startupConfig = config.Configs["Startup"]; 55 if (Util.GetConfigVarFromSections<string>(
56 if (startupConfig.GetString("WorldMapModule", "WorldMap") == "HGWorldMap") 56 config, "WorldMapModule", new string[] { "Map", "Startup" }, "WorldMap") == "HGWorldMap")
57 m_Enabled = true; 57 m_Enabled = true;
58 } 58 }
59 59