OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add osGetGridHomeURI function 

Add osGetHomeURI function to the family of osGetGrid* functions. Returns the SRV_HomeURI setting from the [LoginService] configuration.
iar_mods
BlueWall 2012-01-19 14:21:12 -05:00
parent edb2e4c5b3
commit 8f871cca10
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -1949,6 +1949,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
Nick, Nick,
Name, Name,
Login, Login,
Home,
Custom Custom
}; };
@ -1990,6 +1991,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
retval = json["login"]; retval = json["login"];
break; break;
case InfoType.Home:
retval = json["home"];
break;
case InfoType.Custom: case InfoType.Custom:
retval = json[key]; retval = json[key];
break; break;
@ -2062,6 +2067,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return loginURI; return loginURI;
} }
public string osGetGridHomeURI()
{
CheckThreatLevel(ThreatLevel.Moderate, "osGetGridHomeURI");
m_host.AddScriptLPS(1);
string HomeURI = String.Empty;
IConfigSource config = m_ScriptEngine.ConfigSource;
if (config.Configs["LoginService"] != null)
HomeURI = config.Configs["LoginService"].GetString("SRV_HomeURI", HomeURI);
if (String.IsNullOrEmpty(HomeURI))
HomeURI = GridUserInfo(InfoType.Home);
return HomeURI;
}
public string osGetGridCustom(string key) public string osGetGridCustom(string key)
{ {
CheckThreatLevel(ThreatLevel.Moderate, "osGetGridCustom"); CheckThreatLevel(ThreatLevel.Moderate, "osGetGridCustom");

1
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
View File

@ -160,6 +160,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
string osGetGridNick(); string osGetGridNick();
string osGetGridName(); string osGetGridName();
string osGetGridLoginURI(); string osGetGridLoginURI();
string osGetGridHomeURI();
string osGetGridCustom(string key); string osGetGridCustom(string key);
LSL_String osFormatString(string str, LSL_List strings); LSL_String osFormatString(string str, LSL_List strings);

5
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
View File

@ -452,6 +452,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
return m_OSSL_Functions.osGetGridLoginURI(); return m_OSSL_Functions.osGetGridLoginURI();
} }
public string osGetGridHomeURI()
{
return m_OSSL_Functions.osGetGridHomeURI();
}
public string osGetGridCustom(string key) public string osGetGridCustom(string key)
{ {
return m_OSSL_Functions.osGetGridCustom(key); return m_OSSL_Functions.osGetGridCustom(key);