diff options
| author | Melanie | 2013-02-23 20:37:09 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-23 20:37:09 +0000 |
| commit | e3ea2c4beefb65ba997beab1509aa996a46f7864 (patch) | |
| tree | 778cba450e788b13f4d000c6e49f3d94bd25f65c /OpenSim/Region/CoreModules/Avatar/Lure | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | More clarification on the [Groups] section (diff) | |
| download | opensim-SC_OLD-e3ea2c4beefb65ba997beab1509aa996a46f7864.zip opensim-SC_OLD-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.gz opensim-SC_OLD-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.bz2 opensim-SC_OLD-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Lure')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs index 784a788..22cdc80 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | |||
| @@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
| 65 | { | 65 | { |
| 66 | m_Enabled = true; | 66 | m_Enabled = true; |
| 67 | 67 | ||
| 68 | m_ThisGridURL = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", "Messaging"); | 68 | m_ThisGridURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] {"Startup", "Messaging"}); |
| 69 | // Legacy. Remove soon! | 69 | // Legacy. Remove soon! |
| 70 | m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL); | 70 | m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL); |
| 71 | m_log.DebugFormat("[LURE MODULE]: {0} enabled", Name); | 71 | m_log.DebugFormat("[LURE MODULE]: {0} enabled", Name); |