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/HypergridService/GatekeeperService.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 'OpenSim/Services/HypergridService/GatekeeperService.cs')
| -rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index c41d952..4653da9 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
| @@ -96,7 +96,7 @@ namespace OpenSim.Services.HypergridService | |||
| 96 | UUID.TryParse(scope, out m_ScopeID); | 96 | UUID.TryParse(scope, out m_ScopeID); |
| 97 | //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!"); | 97 | //m_WelcomeMessage = serverConfig.GetString("WelcomeMessage", "Welcome to OpenSim!"); |
| 98 | m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true); | 98 | m_AllowTeleportsToAnyRegion = serverConfig.GetBoolean("AllowTeleportsToAnyRegion", true); |
| 99 | m_ExternalName = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] {"Startup", "GatekeeperService"}); | 99 | m_ExternalName = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "GatekeeperService" }); |
| 100 | m_ExternalName = serverConfig.GetString("ExternalName", m_ExternalName); | 100 | m_ExternalName = serverConfig.GetString("ExternalName", m_ExternalName); |
| 101 | if (m_ExternalName != string.Empty && !m_ExternalName.EndsWith("/")) | 101 | if (m_ExternalName != string.Empty && !m_ExternalName.EndsWith("/")) |
| 102 | m_ExternalName = m_ExternalName + "/"; | 102 | m_ExternalName = m_ExternalName + "/"; |