diff options
| author | Melanie | 2013-02-22 01:28:54 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-22 01:28:54 +0000 |
| commit | 9534d5f9296979b68550177a5201c2bdba84f14e (patch) | |
| tree | 1d39dee6d1eaed10b1146a9ee59a6deaa062bae2 /OpenSim/Services/GridService/HypergridLinker.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.zip opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.tar.gz opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.tar.bz2 opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/GridService/HypergridLinker.cs')
| -rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 073197f..3e7c556 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
| @@ -128,7 +128,9 @@ 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 = gridConfig.GetString("Gatekeeper", string.Empty); | 131 | m_ThisGatekeeper = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", "GridService"); |
| 132 | // Legacy. Remove soon! | ||
| 133 | m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper); | ||
| 132 | try | 134 | try |
| 133 | { | 135 | { |
| 134 | m_ThisGatekeeperURI = new Uri(m_ThisGatekeeper); | 136 | m_ThisGatekeeperURI = new Uri(m_ThisGatekeeper); |