diff options
| author | Melanie | 2013-02-26 13:34:20 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-26 13:34:20 +0000 |
| commit | 54ee95dd8e6649723d92ac893e1699d34822cd80 (patch) | |
| tree | d1d15e17c0a04bef247bfe8e6e0cffd3f8460ff1 /OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | |
| parent | Make sure state machine is reset if crossing is aborted (diff) | |
| parent | BulletSim: tweeks to make avatar jump work better. (diff) | |
| download | opensim-SC-54ee95dd8e6649723d92ac893e1699d34822cd80.zip opensim-SC-54ee95dd8e6649723d92ac893e1699d34822cd80.tar.gz opensim-SC-54ee95dd8e6649723d92ac893e1699d34822cd80.tar.bz2 opensim-SC-54ee95dd8e6649723d92ac893e1699d34822cd80.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs index ec94420..7b11658 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 | ||