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/HypergridService/GatekeeperService.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/HypergridService/GatekeeperService.cs')
| -rw-r--r-- | OpenSim/Services/HypergridService/GatekeeperService.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index 7b84d55..21f363c 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
| @@ -96,7 +96,8 @@ 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 = serverConfig.GetString("ExternalName", string.Empty); | 99 | m_ExternalName = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", "GatekeeperService"); |
| 100 | m_ExternalName = serverConfig.GetString("ExternalName", m_ExternalName); | ||
| 100 | if (m_ExternalName != string.Empty && !m_ExternalName.EndsWith("/")) | 101 | if (m_ExternalName != string.Empty && !m_ExternalName.EndsWith("/")) |
| 101 | m_ExternalName = m_ExternalName + "/"; | 102 | m_ExternalName = m_ExternalName + "/"; |
| 102 | 103 | ||