aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorDiva Canto2013-02-27 20:49:41 -0800
committerDiva Canto2013-02-27 20:49:41 -0800
commitf1010d7b152b68e2961b40482006221e28e976af (patch)
tree6872908b7161842ff6e1db4c23acd39de82b2fbd /OpenSim/Region/ScriptEngine
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-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/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs4
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 d356f8c..e81b4ae 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2138,7 +2138,7 @@ 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"}); 2141 string HomeURI = Util.GetConfigVarFromSections<string>(config, "HomeURI", new string[] { "Startup", "Hypergrid" });
2142 2142
2143 if (!string.IsNullOrEmpty(HomeURI)) 2143 if (!string.IsNullOrEmpty(HomeURI))
2144 return HomeURI; 2144 return HomeURI;
@@ -2159,7 +2159,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2159 m_host.AddScriptLPS(1); 2159 m_host.AddScriptLPS(1);
2160 2160
2161 IConfigSource config = m_ScriptEngine.ConfigSource; 2161 IConfigSource config = m_ScriptEngine.ConfigSource;
2162 string gatekeeperURI = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] {"Startup"}); 2162 string gatekeeperURI = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid" });
2163 2163
2164 if (!string.IsNullOrEmpty(gatekeeperURI)) 2164 if (!string.IsNullOrEmpty(gatekeeperURI))
2165 return gatekeeperURI; 2165 return gatekeeperURI;