aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
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/Region/ScriptEngine/Shared
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-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/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index e81b4ae..48c6b50 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2138,7 +2138,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2138 m_host.AddScriptLPS(1); 2138 m_host.AddScriptLPS(1);
2139 2139
2140 IConfigSource config = m_ScriptEngine.ConfigSource; 2140 IConfigSource config = m_ScriptEngine.ConfigSource;
2141 string HomeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI", new string[] { "Startup", "Hypergrid" }); 2141 string HomeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI",
2142 new string[] { "Startup", "Hypergrid" }, String.Empty);
2142 2143
2143 if (!string.IsNullOrEmpty(HomeURI)) 2144 if (!string.IsNullOrEmpty(HomeURI))
2144 return HomeURI; 2145 return HomeURI;
@@ -2159,7 +2160,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2159 m_host.AddScriptLPS(1); 2160 m_host.AddScriptLPS(1);
2160 2161
2161 IConfigSource config = m_ScriptEngine.ConfigSource; 2162 IConfigSource config = m_ScriptEngine.ConfigSource;
2162 string gatekeeperURI = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid" }); 2163 string gatekeeperURI = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
2164 new string[] { "Startup", "Hypergrid" }, String.Empty);
2163 2165
2164 if (!string.IsNullOrEmpty(gatekeeperURI)) 2166 if (!string.IsNullOrEmpty(gatekeeperURI))
2165 return gatekeeperURI; 2167 return gatekeeperURI;