From d1f1324a2dfc3036ec3914d86d85d859481a7e4d Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 12 Apr 2020 23:19:34 +0100 Subject: [PATCH] update scriptSyntax --- .../Shared/Api/Interface/ILSL_Api.cs | 2 +- bin/ScriptSyntax.xml | 113 +++++++++--------- 2 files changed, 60 insertions(+), 55 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs index 6599c22d30..205e5d58a3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs @@ -218,7 +218,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces LSL_Vector llGetVel(); LSL_Float llGetWallclock(); void llGiveInventory(LSL_Key destination, LSL_String inventory); - void llGiveInventoryList(LSL_Key destination, LSL_String category, LSL_List inventory); + void llGiveInventoryList(LSL_Key destination, LSL_String folderName, LSL_List inventory); LSL_Integer llGiveMoney(LSL_Key destination, LSL_Integer amount); LSL_Key llTransferLindenDollars(LSL_Key destination, LSL_Integer amount); void llGodLikeRezObject(string inventory, LSL_Vector pos); diff --git a/bin/ScriptSyntax.xml b/bin/ScriptSyntax.xml index 8a735dd800..300b5c4a23 100644 --- a/bin/ScriptSyntax.xml +++ b/bin/ScriptSyntax.xml @@ -1,4 +1,4 @@ -28491a28-0c57-0a0d-c221-a7fc30debc18 +a0afab69-80c3-a8d5-d897-0c2c655790b4 llsd-lsl-syntax-version2 controls @@ -1577,7 +1577,7 @@ OS_APIVERSION typeinteger - value11 + value12 OS_ATTACH_MSG_ALL typeinteger @@ -4492,7 +4492,7 @@ arguments destinationtypekey - categorytypestring + folderNametypestring inventorytypelist @@ -6218,39 +6218,6 @@ arguments atypefloat btypefloat - - - osApproxEquals - - returninteger - arguments - vatypevector - vbtypevector - margintypefloat - - - osApproxEquals - - returninteger - arguments - vatypevector - vbtypevector - - - osApproxEquals - - returninteger - arguments - ratyperotation - rbtyperotation - - - osApproxEquals - - returninteger - arguments - ratyperotation - rbtyperotation margintypefloat @@ -6260,9 +6227,42 @@ arguments atypefloat btypefloat + + + osApproxEquals + + returninteger + arguments + vatypevector + vbtypevector margintypefloat + osApproxEquals + + returninteger + arguments + ratyperotation + rbtyperotation + + + osApproxEquals + + returninteger + arguments + ratyperotation + rbtyperotation + margintypefloat + + + osApproxEquals + + returninteger + arguments + vatypevector + vbtypevector + + osAvatarName2Key returnstring @@ -6308,6 +6308,11 @@ arguments + osClearObjectAnimations + + returninteger + arguments + osCollisionSound arguments @@ -6386,6 +6391,8 @@ returnstring arguments drawListtypestring + startXtypeinteger + startYtypeinteger endXtypeinteger endYtypeinteger @@ -6395,8 +6402,6 @@ returnstring arguments drawListtypestring - startXtypeinteger - startYtypeinteger endXtypeinteger endYtypeinteger @@ -7027,7 +7032,6 @@ nametypestring positiontypevector notecardtypestring - optionstypeinteger osNpcCreate @@ -7038,6 +7042,7 @@ nametypestring positiontypevector notecardtypestring + optionstypeinteger osNpcGetOwner @@ -7277,7 +7282,6 @@ returninteger arguments secondstypefloat - msgtypestring osRegionRestart @@ -7285,6 +7289,7 @@ returninteger arguments secondstypefloat + msgtypestring osReplaceString @@ -7528,7 +7533,7 @@ osSetProjectionParams arguments - linknumbertypeinteger + primtypekey projectiontypeinteger texturetypekey fovtypefloat @@ -7539,7 +7544,7 @@ osSetProjectionParams arguments - primtypekey + linknumbertypeinteger projectiontypeinteger texturetypekey fovtypefloat @@ -7692,8 +7697,6 @@ arguments srctypestring valuetypestring - starttypeinteger - counttypeinteger ignorecasetypeinteger @@ -7703,6 +7706,8 @@ arguments srctypestring valuetypestring + starttypeinteger + counttypeinteger ignorecasetypeinteger @@ -7739,7 +7744,6 @@ arguments srctypestring starttypeinteger - lengthtypeinteger osStringSubString @@ -7748,6 +7752,7 @@ arguments srctypestring starttypeinteger + lengthtypeinteger osSunGetParam @@ -7768,7 +7773,6 @@ arguments agenttypestring - regionNametypestring positiontypevector lookattypevector @@ -7787,6 +7791,7 @@ arguments agenttypestring + regionNametypestring positiontypevector lookattypevector @@ -7802,14 +7807,6 @@ osTeleportOwner - - arguments - regionNametypestring - positiontypevector - lookattypevector - - - osTeleportOwner arguments positiontypevector @@ -7825,6 +7822,14 @@ lookattypevector + osTeleportOwner + + arguments + regionNametypestring + positiontypevector + lookattypevector + + osTerrainFlush arguments