diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 6ee83aed74..7494b88584 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -3563,7 +3563,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api /// /// /// - public LSL_Key osGetRegionMapTexture(string regionName) + public LSL_Key osGetRegionMapTexture(string regionNameOrID) { CheckThreatLevel(ThreatLevel.High, "osGetRegionMapTexture"); @@ -3571,11 +3571,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api UUID key = UUID.Zero; GridRegion region; + if(string.IsNullOrWhiteSpace(regionNameOrID)) + { + return scene.RegionInfo.RegionSettings.TerrainImageID.ToString(); + } + //If string is a key, use it. Otherwise, try to locate region by name. - if (UUID.TryParse(regionName, out key)) + if (UUID.TryParse(regionNameOrID, out key)) region = scene.GridService.GetRegionByUUID(UUID.Zero, key); else - region = scene.GridService.GetRegionByName(UUID.Zero, regionName); + region = scene.GridService.GetRegionByName(UUID.Zero, regionNameOrID); // If region was found, return the regions map texture key. if (region != null) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index c65b78503b..1bd6e086fb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs @@ -375,7 +375,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces key osGetGender(LSL_Key rawAvatarId); key osGetMapTexture(); - key osGetRegionMapTexture(string regionName); + key osGetRegionMapTexture(string regionNameOrID); LSL_List osGetRegionStats(); vector osGetRegionSize(); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 12c63b308d..549047c03d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs @@ -945,9 +945,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase return m_OSSL_Functions.osGetMapTexture(); } - public key osGetRegionMapTexture(string regionName) + public key osGetRegionMapTexture(string regionNameOrID) { - return m_OSSL_Functions.osGetRegionMapTexture(regionName); + return m_OSSL_Functions.osGetRegionMapTexture(regionNameOrID); } public LSL_List osGetRegionStats()