From 5b596bb29e0d1f345e6fa150ef1033650f2ac249 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 30 Jun 2020 13:29:42 +0100 Subject: [PATCH] update script syntax --- .../World/Estate/EstateManagementModule.cs | 2 - .../Shared/Api/Runtime/LSL_Constants.cs | 2 +- bin/ScriptSyntax.xml | 238 ++++++++++++++---- 3 files changed, 185 insertions(+), 57 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 81c56a733f..9636117f27 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs @@ -424,8 +424,6 @@ namespace OpenSim.Region.CoreModules.World.Estate private void sendDetailedEstateData(IClientAPI remote_client, UUID invoice) { - //uint sun = 0; - UUID estateOwner; estateOwner = Scene.RegionInfo.EstateSettings.EstateOwner; diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index adb327cdc8..71a2b16017 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 = 12; + public static readonly LSLInteger OS_APIVERSION = 13; public static readonly LSLInteger TRUE = 1; public static readonly LSLInteger FALSE = 0; diff --git a/bin/ScriptSyntax.xml b/bin/ScriptSyntax.xml index 300b5c4a23..0b4dbf2e04 100644 --- a/bin/ScriptSyntax.xml +++ b/bin/ScriptSyntax.xml @@ -1,4 +1,4 @@ -a0afab69-80c3-a8d5-d897-0c2c655790b4 +31131f85-748a-9940-d0d5-4a1622bb4875 llsd-lsl-syntax-version2 controls @@ -1577,7 +1577,7 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 OS_APIVERSION typeinteger - value12 + value13 OS_ATTACH_MSG_ALL typeinteger @@ -3925,6 +3925,16 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 returnstring arguments + llGetDayLength + + returninteger + arguments + + llGetDayOffset + + returninteger + arguments + llGetDisplayName returnstring @@ -4133,6 +4143,16 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 returnfloat arguments + llGetMoonDirection + + returnvector + arguments + + llGetMoonRotation + + returnrotation + arguments + llGetNextEmail arguments @@ -4318,6 +4338,16 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 returnvector arguments + llGetRegionDayLength + + returninteger + arguments + + llGetRegionDayOffset + + returninteger + arguments + llGetRegionFlags returninteger @@ -4328,11 +4358,31 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 returnfloat arguments + llGetRegionMoonDirection + + returnvector + arguments + + llGetRegionMoonRotation + + returnrotation + arguments + llGetRegionName returnstring arguments + llGetRegionSunDirection + + returnvector + arguments + + llGetRegionSunRotation + + returnrotation + arguments + llGetRegionTimeDilation returnfloat @@ -4406,6 +4456,11 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 returnvector arguments + llGetSunRotation + + returnrotation + arguments + llGetTexture returnstring @@ -6197,6 +6252,15 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 osAgentSaveAppearance + + returnkey + arguments + agentIdtypekey + notecardtypestring + includeHudstypeinteger + + + osAgentSaveAppearance returnkey arguments @@ -6216,25 +6280,8 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 returninteger arguments - atypefloat - btypefloat - margintypefloat - - - osApproxEquals - - returninteger - arguments - atypefloat - btypefloat - - - osApproxEquals - - returninteger - arguments - vatypevector - vbtypevector + ratyperotation + rbtyperotation margintypefloat @@ -6250,8 +6297,8 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 returninteger arguments - ratyperotation - rbtyperotation + vatypevector + vbtypevector margintypefloat @@ -6263,6 +6310,23 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 vbtypevector + osApproxEquals + + returninteger + arguments + atypefloat + btypefloat + margintypefloat + + + osApproxEquals + + returninteger + arguments + atypefloat + btypefloat + + osAvatarName2Key returnstring @@ -6576,6 +6640,30 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 returnlist arguments + osGetApparentRegionTime + + returnfloat + arguments + + osGetApparentRegionTimeString + + returnstring + arguments + format24typeinteger + + + osGetApparentTime + + returnfloat + arguments + + osGetApparentTimeString + + returnstring + arguments + format24typeinteger + + osGetAvatarHomeURI returnstring @@ -6906,15 +6994,15 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 osKickAvatar arguments - agentIdtypekey + FirstNametypestring + SurNametypestring alerttypestring osKickAvatar arguments - FirstNametypestring - SurNametypestring + agentIdtypekey alerttypestring @@ -7107,13 +7195,15 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 arguments npctypekey notecardtypestring + includeHudstypeinteger - osNpcSay + osNpcSaveAppearance + returnkey arguments npctypekey - messagetypestring + notecardtypestring osNpcSay @@ -7124,6 +7214,13 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 messagetypestring + osNpcSay + + arguments + npctypekey + messagetypestring + + osNpcSayTo arguments @@ -7206,6 +7303,14 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 osOwnerSaveAppearance + + returnkey + arguments + notecardtypestring + includeHudstypeinteger + + + osOwnerSaveAppearance returnkey arguments @@ -7267,13 +7372,21 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 osRegionNotice arguments - agentIDtypekey msgtypestring osRegionNotice arguments + agentIDtypekey + msgtypestring + + + osRegionRestart + + returninteger + arguments + secondstypefloat msgtypestring @@ -7284,12 +7397,21 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 secondstypefloat - osRegionRestart + osReplaceAgentEnvironment returninteger arguments - secondstypefloat - msgtypestring + agentkeytypekey + transitiontypeinteger + daycycletypestring + + + osReplaceParcelEnvironment + + returninteger + arguments + transitiontypeinteger + daycycletypestring osReplaceString @@ -7323,6 +7445,14 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 AllLinksettypeinteger + osResetEnvironment + + returninteger + arguments + parcelOrRegiontypeinteger + transitiontypeinteger + + osRound returnfloat @@ -7677,21 +7807,12 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 arguments srctypestring valuetypestring + starttypeinteger + counttypeinteger ignorecasetypeinteger osStringIndexOf - - returninteger - arguments - srctypestring - valuetypestring - starttypeinteger - counttypeinteger - ignorecasetypeinteger - - - osStringLastIndexOf returninteger arguments @@ -7711,6 +7832,15 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 ignorecasetypeinteger + osStringLastIndexOf + + returninteger + arguments + srctypestring + valuetypestring + ignorecasetypeinteger + + osStringRemove returnstring @@ -7744,6 +7874,7 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 arguments srctypestring starttypeinteger + lengthtypeinteger osStringSubString @@ -7752,7 +7883,6 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 arguments srctypestring starttypeinteger - lengthtypeinteger osSunGetParam @@ -7770,6 +7900,15 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 osTeleportAgent + + arguments + agenttypestring + regionNametypestring + positiontypevector + lookattypevector + + + osTeleportAgent arguments agenttypestring @@ -7787,15 +7926,6 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 lookattypevector - osTeleportAgent - - arguments - agenttypestring - regionNametypestring - positiontypevector - lookattypevector - - osTeleportObject returninteger @@ -7809,6 +7939,7 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 osTeleportOwner arguments + regionNametypestring positiontypevector lookattypevector @@ -7825,7 +7956,6 @@ a0afab69-80c3-a8d5-d897-0c2c655790b4 osTeleportOwner arguments - regionNametypestring positiontypevector lookattypevector