From 0163af970f7c0bf792ee12d2267c6122ca35fb98 Mon Sep 17 00:00:00 2001 From: TBG Renfold Date: Fri, 26 Jul 2019 19:08:40 +0100 Subject: [PATCH] Mantis #8481 part two. Signed-off-by: UbitUmarov --- .../ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 10 ++++++++++ .../ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 1 + .../ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 7d3c832d1e..ab3a7688c3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -1600,6 +1600,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return 0.0f; } + public int osGetParcelDwell(LSL_Vector pos) + { + LandData land = World.GetLandData(pos); + if (land != null) + { + return (int)land.Dwell; + } + return 0; + } + // Routines for creating and managing parcels programmatically public void osParcelJoin(LSL_Vector pos1, LSL_Vector pos2) { diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 194df36fec..5d964b87e2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs @@ -260,6 +260,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces LSL_Float osGetWindParam(string plugin, string param); // Parcel commands + int osGetParcelDwell(vector pos); void osParcelJoin(vector pos1, vector pos2); void osParcelSubdivide(vector pos1, vector pos2); void osSetParcelDetails(vector pos, LSL_List rules); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 88ea9d5660..abdf0df5d5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs @@ -116,6 +116,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase return m_OSSL_Functions.osGetWindParam(plugin, param); } + public int osGetParcelDwell(vector pos) + { + return m_OSSL_Functions.osGetParcelDwell(pos); + } + public void osParcelJoin(vector pos1, vector pos2) { m_OSSL_Functions.osParcelJoin(pos1,pos2);