diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 4f1eb52e63..a52bc507ba 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -2624,28 +2624,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api /// 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)