diff options
| author | Melanie | 2013-02-28 21:20:07 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-28 21:20:07 +0000 |
| commit | eb9458fd7e3a9098712f501cdcf05d71f741ec14 (patch) | |
| tree | 1a719b0d89f22cefd04866db162694d0eb724d8d /OpenSim/Region/CoreModules/Avatar/Lure | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix potential concurrency issue since the LSL notecard cache was not being ch... (diff) | |
| download | opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.zip opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.gz opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.bz2 opensim-SC_OLD-eb9458fd7e3a9098712f501cdcf05d71f741ec14.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Lure')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs index 22cdc80..6c9fd86 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/HGLureModule.cs | |||
| @@ -65,7 +65,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
| 65 | { | 65 | { |
| 66 | m_Enabled = true; | 66 | m_Enabled = true; |
| 67 | 67 | ||
| 68 | m_ThisGridURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] {"Startup", "Messaging"}); | 68 | m_ThisGridURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", |
| 69 | new string[] { "Startup", "Hypergrid", "Messaging" }, String.Empty); | ||
| 69 | // Legacy. Remove soon! | 70 | // Legacy. Remove soon! |
| 70 | m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL); | 71 | m_ThisGridURL = config.Configs["Messaging"].GetString("Gatekeeper", m_ThisGridURL); |
| 71 | m_log.DebugFormat("[LURE MODULE]: {0} enabled", Name); | 72 | m_log.DebugFormat("[LURE MODULE]: {0} enabled", Name); |