From b5b518dc0d1996c3ed0effe7c39b7daff2d1441b Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 31 Jul 2019 13:38:49 +0100 Subject: change value of PARCEL_DETAILS_DWELL to a higher value to give more room for standard values, change return types, update script syntaxe --- OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +- OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 +- OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 2 +- OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 5 +++-- OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/Shared/Api') diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index e59bfe8..980b2a5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -14343,7 +14343,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api case "5": ret.Add(new LSL_Key(land.GlobalID.ToString())); break; - case "20": + case "64": ret.Add(new LSL_Integer(land.Dwell)); break; default: diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index ab3a768..62da221 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -1600,7 +1600,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return 0.0f; } - public int osGetParcelDwell(LSL_Vector pos) + public LSL_Integer osGetParcelDwell(LSL_Vector pos) { LandData land = World.GetLandData(pos); if (land != null) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 5d964b8..7c5ced8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs @@ -260,7 +260,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces LSL_Float osGetWindParam(string plugin, string param); // Parcel commands - int osGetParcelDwell(vector pos); + LSL_Integer 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/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index 371460a..f93cea8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs @@ -35,7 +35,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase public partial class ScriptBaseClass { // SCRIPTS CONSTANTS - public static readonly LSLInteger OS_APIVERSION = 4; + public static readonly LSLInteger OS_APIVERSION = 5; public static readonly LSLInteger TRUE = 1; public static readonly LSLInteger FALSE = 0; @@ -721,7 +721,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase // constants for llGetParcelDetails public const int PARCEL_DETAILS_NAME = 0; public const int PARCEL_DETAILS_DESC = 1; - public const int PARCEL_DETAILS_DWELL = 20; public const int PARCEL_DETAILS_OWNER = 2; public const int PARCEL_DETAILS_GROUP = 3; public const int PARCEL_DETAILS_AREA = 4; @@ -729,6 +728,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase public const int PARCEL_DETAILS_SEE_AVATARS = 6; public const int PARCEL_DETAILS_ANY_AVATAR_SOUNDS = 7; public const int PARCEL_DETAILS_GROUP_SOUNDS = 8; + // constants for llGetParcelDetails os specific + public const int PARCEL_DETAILS_DWELL = 64; //osSetParcelDetails public const int PARCEL_DETAILS_CLAIMDATE = 10; diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index abdf0df..6a70305 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs @@ -116,7 +116,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase return m_OSSL_Functions.osGetWindParam(plugin, param); } - public int osGetParcelDwell(vector pos) + public LSL_Integer osGetParcelDwell(vector pos) { return m_OSSL_Functions.osGetParcelDwell(pos); } -- cgit v1.1