diff options
| author | Diva Canto | 2013-02-27 20:59:16 -0800 |
|---|---|---|
| committer | Diva Canto | 2013-02-27 20:59:16 -0800 |
| commit | bb447581795cb622e88a071d3050370c64ace946 (patch) | |
| tree | b082adf321464c7cca0ada76fc36bdf223cc4d8b /OpenSim/Services/GridService | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-bb447581795cb622e88a071d3050370c64ace946.zip opensim-SC_OLD-bb447581795cb622e88a071d3050370c64ace946.tar.gz opensim-SC_OLD-bb447581795cb622e88a071d3050370c64ace946.tar.bz2 opensim-SC_OLD-bb447581795cb622e88a071d3050370c64ace946.tar.xz | |
Switched to using the other Util function with a default value.
Diffstat (limited to 'OpenSim/Services/GridService')
| -rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index 885c2aa..8335724 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
| @@ -128,7 +128,8 @@ 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.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "GridService" }); | 131 | m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", |
| 132 | new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); | ||
| 132 | // Legacy. Remove soon! | 133 | // Legacy. Remove soon! |
| 133 | m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper); | 134 | m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper); |
| 134 | try | 135 | try |