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/Services/GridService | |
| 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 '')
| -rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 3e7c556..80575ee 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
| @@ -128,7 +128,7 @@ namespace OpenSim.Services.GridService | |||
| 128 | 128 | ||
| 129 | m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles"); | 129 | m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles"); |
| 130 | 130 | ||
| 131 | m_ThisGatekeeper = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", "GridService"); | 131 | m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] {"Startup", "GridService"}); |
| 132 | // Legacy. Remove soon! | 132 | // Legacy. Remove soon! |
| 133 | m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper); | 133 | m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper); |
| 134 | try | 134 | try |