diff options
author | BlueWall | 2012-01-19 14:21:12 -0500 |
---|---|---|
committer | BlueWall | 2012-01-19 14:21:12 -0500 |
commit | 8f871cca10274325bf90054d75019a865fc50216 (patch) | |
tree | 66d6869334393bc96882c4c421cfaeb80d5abbb5 /OpenSim/Region/ScriptEngine | |
parent | Change URI to lowercase to match existing (diff) | |
download | opensim-SC_OLD-8f871cca10274325bf90054d75019a865fc50216.zip opensim-SC_OLD-8f871cca10274325bf90054d75019a865fc50216.tar.gz opensim-SC_OLD-8f871cca10274325bf90054d75019a865fc50216.tar.bz2 opensim-SC_OLD-8f871cca10274325bf90054d75019a865fc50216.tar.xz |
Add osGetGridHomeURI function
Add osGetHomeURI function to the family of osGetGrid* functions. Returns the SRV_HomeURI setting from the [LoginService] configuration.
Diffstat (limited to '')
3 files changed, 28 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 c682fda..7792ab5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -1949,6 +1949,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1949 | Nick, | 1949 | Nick, |
1950 | Name, | 1950 | Name, |
1951 | Login, | 1951 | Login, |
1952 | Home, | ||
1952 | Custom | 1953 | Custom |
1953 | }; | 1954 | }; |
1954 | 1955 | ||
@@ -1990,6 +1991,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1990 | retval = json["login"]; | 1991 | retval = json["login"]; |
1991 | break; | 1992 | break; |
1992 | 1993 | ||
1994 | case InfoType.Home: | ||
1995 | retval = json["home"]; | ||
1996 | break; | ||
1997 | |||
1993 | case InfoType.Custom: | 1998 | case InfoType.Custom: |
1994 | retval = json[key]; | 1999 | retval = json[key]; |
1995 | break; | 2000 | break; |
@@ -2062,6 +2067,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2062 | return loginURI; | 2067 | return loginURI; |
2063 | } | 2068 | } |
2064 | 2069 | ||
2070 | public string osGetGridHomeURI() | ||
2071 | { | ||
2072 | CheckThreatLevel(ThreatLevel.Moderate, "osGetGridHomeURI"); | ||
2073 | m_host.AddScriptLPS(1); | ||
2074 | |||
2075 | string HomeURI = String.Empty; | ||
2076 | IConfigSource config = m_ScriptEngine.ConfigSource; | ||
2077 | |||
2078 | if (config.Configs["LoginService"] != null) | ||
2079 | HomeURI = config.Configs["LoginService"].GetString("SRV_HomeURI", HomeURI); | ||
2080 | |||
2081 | if (String.IsNullOrEmpty(HomeURI)) | ||
2082 | HomeURI = GridUserInfo(InfoType.Home); | ||
2083 | |||
2084 | return HomeURI; | ||
2085 | } | ||
2086 | |||
2065 | public string osGetGridCustom(string key) | 2087 | public string osGetGridCustom(string key) |
2066 | { | 2088 | { |
2067 | CheckThreatLevel(ThreatLevel.Moderate, "osGetGridCustom"); | 2089 | 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 c1c4511..0f8cbdc 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -160,6 +160,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
160 | string osGetGridNick(); | 160 | string osGetGridNick(); |
161 | string osGetGridName(); | 161 | string osGetGridName(); |
162 | string osGetGridLoginURI(); | 162 | string osGetGridLoginURI(); |
163 | string osGetGridHomeURI(); | ||
163 | string osGetGridCustom(string key); | 164 | string osGetGridCustom(string key); |
164 | 165 | ||
165 | LSL_String osFormatString(string str, LSL_List strings); | 166 | 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 fc83786..02efecf 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -452,6 +452,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
452 | return m_OSSL_Functions.osGetGridLoginURI(); | 452 | return m_OSSL_Functions.osGetGridLoginURI(); |
453 | } | 453 | } |
454 | 454 | ||
455 | public string osGetGridHomeURI() | ||
456 | { | ||
457 | return m_OSSL_Functions.osGetGridHomeURI(); | ||
458 | } | ||
459 | |||
455 | public string osGetGridCustom(string key) | 460 | public string osGetGridCustom(string key) |
456 | { | 461 | { |
457 | return m_OSSL_Functions.osGetGridCustom(key); | 462 | return m_OSSL_Functions.osGetGridCustom(key); |