ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 13:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove threat checks from osGetGridNick and osGetGridName

Browse Source
This commit is contained in:
UbitUmarov
2021-06-01 23:04:46 +01:00
parent 75dac827fa
commit cd74acc16b
1 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2624,28 +2624,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
/// <returns></returns>
public string osGetGridNick()
{
CheckThreatLevel(ThreatLevel.Moderate, "osGetGridNick");
string nick = String.Empty;
IConfigSource config = m_ScriptEngine.ConfigSource;
if (config.Configs[GridInfoServiceConfigSectionName] != null)
nick = config.Configs[GridInfoServiceConfigSectionName].GetString("gridnick", nick);
if (String.IsNullOrEmpty(nick))
nick = GridUserInfo(InfoType.Nick);
return nick;
return World.SceneGridInfo == null ? string.Empty : World.SceneGridInfo.GridName;
}
public string osGetGridName()
{
CheckThreatLevel(ThreatLevel.Moderate, "osGetGridName");
if(World.SceneGridInfo == null)
return string.Empty;
return World.SceneGridInfo.GridName;
return World.SceneGridInfo == null ? string.Empty : World.SceneGridInfo.GridName;
}
public string osGetGridLoginURI()
@@ -2668,14 +2652,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
CheckThreatLevel(ThreatLevel.Moderate, "osGetGridHomeURI");
return World.SceneGridInfo.HomeURLNoEndSlash;
return World.SceneGridInfo == null ? string.Empty : World.SceneGridInfo.HomeURLNoEndSlash;
}
public string osGetGridGatekeeperURI()
{
CheckThreatLevel(ThreatLevel.Moderate, "osGetGridGatekeeperURI");
return World.SceneGridInfo.GateKeeperURLNoEndSlash;
return World.SceneGridInfo == null ? string.Empty : World.SceneGridInfo.GateKeeperURLNoEndSlash;
}
public string osGetGridCustom(string key)