diff options
author | Melanie | 2013-02-23 20:37:09 +0000 |
---|---|---|
committer | Melanie | 2013-02-23 20:37:09 +0000 |
commit | e3ea2c4beefb65ba997beab1509aa996a46f7864 (patch) | |
tree | 778cba450e788b13f4d000c6e49f3d94bd25f65c /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | More clarification on the [Groups] section (diff) | |
download | opensim-SC_OLD-e3ea2c4beefb65ba997beab1509aa996a46f7864.zip opensim-SC_OLD-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.gz opensim-SC_OLD-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.bz2 opensim-SC_OLD-e3ea2c4beefb65ba997beab1509aa996a46f7864.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 |
1 files changed, 2 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 d64e6d7..4c018d4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -2173,7 +2173,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2173 | m_host.AddScriptLPS(1); | 2173 | m_host.AddScriptLPS(1); |
2174 | 2174 | ||
2175 | IConfigSource config = m_ScriptEngine.ConfigSource; | 2175 | IConfigSource config = m_ScriptEngine.ConfigSource; |
2176 | string HomeURI = Util.GetConfigVarWithDefaultSection(config, "HomeURI", string.Empty); | 2176 | string HomeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI", new string[]{"Startup"}); |
2177 | 2177 | ||
2178 | if (!string.IsNullOrEmpty(HomeURI)) | 2178 | if (!string.IsNullOrEmpty(HomeURI)) |
2179 | return HomeURI; | 2179 | return HomeURI; |
@@ -2194,7 +2194,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2194 | m_host.AddScriptLPS(1); | 2194 | m_host.AddScriptLPS(1); |
2195 | 2195 | ||
2196 | IConfigSource config = m_ScriptEngine.ConfigSource; | 2196 | IConfigSource config = m_ScriptEngine.ConfigSource; |
2197 | string gatekeeperURI = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", string.Empty); | 2197 | string gatekeeperURI = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] {"Startup"}); |
2198 | 2198 | ||
2199 | if (!string.IsNullOrEmpty(gatekeeperURI)) | 2199 | if (!string.IsNullOrEmpty(gatekeeperURI)) |
2200 | return gatekeeperURI; | 2200 | return gatekeeperURI; |