diff options
author | Diva Canto | 2012-03-10 19:51:28 -0800 |
---|---|---|
committer | Diva Canto | 2012-03-10 19:51:28 -0800 |
commit | 824eb7ed20a006a7abf0b1cd4d7f46d9c154647e (patch) | |
tree | 0de9f016f1626156b41979f8d20b0dc1f9160e40 /OpenSim/Region/ScriptEngine/Shared | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-824eb7ed20a006a7abf0b1cd4d7f46d9c154647e.zip opensim-SC_OLD-824eb7ed20a006a7abf0b1cd4d7f46d9c154647e.tar.gz opensim-SC_OLD-824eb7ed20a006a7abf0b1cd4d7f46d9c154647e.tar.bz2 opensim-SC_OLD-824eb7ed20a006a7abf0b1cd4d7f46d9c154647e.tar.xz |
Added osGetGridGatekeeperURI()
Diffstat (limited to '')
3 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 8edd146..3dbc31a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -2093,6 +2093,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2093 | return HomeURI; | 2093 | return HomeURI; |
2094 | } | 2094 | } |
2095 | 2095 | ||
2096 | public string osGetGridGatekeeperURI() | ||
2097 | { | ||
2098 | CheckThreatLevel(ThreatLevel.Moderate, "osGetGridGatekeeperURI"); | ||
2099 | m_host.AddScriptLPS(1); | ||
2100 | |||
2101 | string gatekeeperURI = String.Empty; | ||
2102 | IConfigSource config = m_ScriptEngine.ConfigSource; | ||
2103 | |||
2104 | if (config.Configs["GridService"] != null) | ||
2105 | gatekeeperURI = config.Configs["GridService"].GetString("Gatekeeper", gatekeeperURI); | ||
2106 | |||
2107 | return gatekeeperURI; | ||
2108 | } | ||
2109 | |||
2096 | public string osGetGridCustom(string key) | 2110 | public string osGetGridCustom(string key) |
2097 | { | 2111 | { |
2098 | CheckThreatLevel(ThreatLevel.Moderate, "osGetGridCustom"); | 2112 | CheckThreatLevel(ThreatLevel.Moderate, "osGetGridCustom"); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 82a6caf..a5b906f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -161,6 +161,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
161 | string osGetGridName(); | 161 | string osGetGridName(); |
162 | string osGetGridLoginURI(); | 162 | string osGetGridLoginURI(); |
163 | string osGetGridHomeURI(); | 163 | string osGetGridHomeURI(); |
164 | string osGetGridGatekeeperURI(); | ||
164 | string osGetGridCustom(string key); | 165 | string osGetGridCustom(string key); |
165 | 166 | ||
166 | LSL_String osFormatString(string str, LSL_List strings); | 167 | LSL_String osFormatString(string str, LSL_List strings); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 4341246..e048da2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -457,6 +457,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
457 | return m_OSSL_Functions.osGetGridHomeURI(); | 457 | return m_OSSL_Functions.osGetGridHomeURI(); |
458 | } | 458 | } |
459 | 459 | ||
460 | public string osGetGridGatekeeperURI() | ||
461 | { | ||
462 | return m_OSSL_Functions.osGetGridGatekeeperURI(); | ||
463 | } | ||
464 | |||
460 | public string osGetGridCustom(string key) | 465 | public string osGetGridCustom(string key) |
461 | { | 466 | { |
462 | return m_OSSL_Functions.osGetGridCustom(key); | 467 | return m_OSSL_Functions.osGetGridCustom(key); |