diff options
| author | Diva Canto | 2013-02-27 20:49:41 -0800 |
|---|---|---|
| committer | Diva Canto | 2013-02-27 20:49:41 -0800 |
| commit | f1010d7b152b68e2961b40482006221e28e976af (patch) | |
| tree | 6872908b7161842ff6e1db4c23acd39de82b2fbd /OpenSim/Services/GridService/HypergridLinker.cs | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-f1010d7b152b68e2961b40482006221e28e976af.zip opensim-SC_OLD-f1010d7b152b68e2961b40482006221e28e976af.tar.gz opensim-SC_OLD-f1010d7b152b68e2961b40482006221e28e976af.tar.bz2 opensim-SC_OLD-f1010d7b152b68e2961b40482006221e28e976af.tar.xz | |
Moved the HG default variables out of [Startup] and into their own section [Hypergrid] in *Common.ini.example. Backwards compatible for now.
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 80575ee..885c2aa 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.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] {"Startup", "GridService"}); | 131 | m_ThisGatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "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 |