aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/HypergridService/GatekeeperService.cs
diff options
context:
space:
mode:
authorDiva Canto2013-02-27 20:59:16 -0800
committerDiva Canto2013-02-27 20:59:16 -0800
commitbb447581795cb622e88a071d3050370c64ace946 (patch)
treeb082adf321464c7cca0ada76fc36bdf223cc4d8b /OpenSim/Services/HypergridService/GatekeeperService.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-bb447581795cb622e88a071d3050370c64ace946.zip
opensim-SC-bb447581795cb622e88a071d3050370c64ace946.tar.gz
opensim-SC-bb447581795cb622e88a071d3050370c64ace946.tar.bz2
opensim-SC-bb447581795cb622e88a071d3050370c64ace946.tar.xz
Switched to using the other Util function with a default value.
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/HypergridService/GatekeeperService.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 4653da9..97a0afc 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 = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "GatekeeperService" }); 99 m_ExternalName = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
100 new string[] { "Startup", "Hypergrid", "GatekeeperService" }, String.Empty);
100 m_ExternalName = serverConfig.GetString("ExternalName", m_ExternalName); 101 m_ExternalName = serverConfig.GetString("ExternalName", m_ExternalName);
101 if (m_ExternalName != string.Empty && !m_ExternalName.EndsWith("/")) 102 if (m_ExternalName != string.Empty && !m_ExternalName.EndsWith("/"))
102 m_ExternalName = m_ExternalName + "/"; 103 m_ExternalName = m_ExternalName + "/";