aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorDiva Canto2013-02-21 17:26:19 -0800
committerDiva Canto2013-02-21 17:26:19 -0800
commite515cdddec435e97e9ed4722de08ee410e94a7e6 (patch)
tree0b090dc495ef464e037d4f134f059bce35504d2f /OpenSim/Region/ScriptEngine/Shared
parentBulletSim: add OutOfBounds logic and some position sanity checking (diff)
downloadopensim-SC_OLD-e515cdddec435e97e9ed4722de08ee410e94a7e6.zip
opensim-SC_OLD-e515cdddec435e97e9ed4722de08ee410e94a7e6.tar.gz
opensim-SC_OLD-e515cdddec435e97e9ed4722de08ee410e94a7e6.tar.bz2
opensim-SC_OLD-e515cdddec435e97e9ed4722de08ee410e94a7e6.tar.xz
Simplification of HG configs: HomeURI and GatekeeperURI now are defined as default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs12
1 files changed, 10 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 1426070..0334169 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2137,9 +2137,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2137 CheckThreatLevel(ThreatLevel.Moderate, "osGetGridHomeURI"); 2137 CheckThreatLevel(ThreatLevel.Moderate, "osGetGridHomeURI");
2138 m_host.AddScriptLPS(1); 2138 m_host.AddScriptLPS(1);
2139 2139
2140 string HomeURI = String.Empty;
2141 IConfigSource config = m_ScriptEngine.ConfigSource; 2140 IConfigSource config = m_ScriptEngine.ConfigSource;
2141 string HomeURI = Util.GetConfigVarWithDefaultSection(config, "HomeURI", string.Empty);
2142 2142
2143 if (!string.IsNullOrEmpty(HomeURI))
2144 return HomeURI;
2145
2146 // Legacy. Remove soon!
2143 if (config.Configs["LoginService"] != null) 2147 if (config.Configs["LoginService"] != null)
2144 HomeURI = config.Configs["LoginService"].GetString("SRV_HomeURI", HomeURI); 2148 HomeURI = config.Configs["LoginService"].GetString("SRV_HomeURI", HomeURI);
2145 2149
@@ -2154,9 +2158,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2154 CheckThreatLevel(ThreatLevel.Moderate, "osGetGridGatekeeperURI"); 2158 CheckThreatLevel(ThreatLevel.Moderate, "osGetGridGatekeeperURI");
2155 m_host.AddScriptLPS(1); 2159 m_host.AddScriptLPS(1);
2156 2160
2157 string gatekeeperURI = String.Empty;
2158 IConfigSource config = m_ScriptEngine.ConfigSource; 2161 IConfigSource config = m_ScriptEngine.ConfigSource;
2162 string gatekeeperURI = Util.GetConfigVarWithDefaultSection(config, "GatekeeperURI", string.Empty);
2163
2164 if (!string.IsNullOrEmpty(gatekeeperURI))
2165 return gatekeeperURI;
2159 2166
2167 // Legacy. Remove soon!
2160 if (config.Configs["GridService"] != null) 2168 if (config.Configs["GridService"] != null)
2161 gatekeeperURI = config.Configs["GridService"].GetString("Gatekeeper", gatekeeperURI); 2169 gatekeeperURI = config.Configs["GridService"].GetString("Gatekeeper", gatekeeperURI);
2162 2170