From c618c4a6c453c4403e0bb32f58532fde6c3cb5ca Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 5 Mar 2024 18:51:42 +0000 Subject: [PATCH] rename the new osGetInventoryKeys as osgetinventoryitemkeys and osgetlinkinventorykey as osgetinventoryitemkey for coerence and to make clear that key means the item key within prim inventory and not its asset key as in ll funtion --- .../Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 ++-- OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 4 ++-- bin/ScriptSyntax.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 001cacd591..81e6cb73b8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -5541,7 +5541,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return (item == null) ? LSL_String.Empty : item.Description; } - public LSL_Key osGetLinkInventoryKey(LSL_Integer linkNumber, LSL_String name) + public LSL_Key osGetLinkInventoryItemKey(LSL_Integer linkNumber, LSL_String name) { SceneObjectPart part = GetSingleLinkPart(linkNumber); if(part == null) @@ -5561,7 +5561,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return LSL_String.NullKey; } - public LSL_List osGetInventoryKeys(LSL_Integer type) + public LSL_List osGetInventoryItemKeys(LSL_Integer type) { LSL_List ret = new(); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 66ae67d916..076a9f6107 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs @@ -561,12 +561,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces LSL_Integer osApproxEquals(rotation ra, rotation rb, LSL_Float margin); LSL_Key osGetInventoryLastOwner(LSL_String itemNameOrId); LSL_Key osGetInventoryItemKey(LSL_String name); - LSL_Key osGetLinkInventoryKey(LSL_Integer linkNumber, LSL_String name); + LSL_Key osGetLinkInventoryItemKey(LSL_Integer linkNumber, LSL_String name); LSL_String osGetInventoryName(LSL_Key itemId); LSL_String osGetLinkInventoryName(LSL_Integer linkNumber, LSL_Key itemId); LSL_String osGetInventoryDesc(LSL_String itemNameOrId); LSL_String osGetLinkInventoryDesc(LSL_Integer linkNumber, LSL_String itemNameorid); - LSL_List osGetInventoryKeys(LSL_Integer type); + LSL_List osGetInventoryItemKeys(LSL_Integer type); LSL_List osGetLinkInventoryKeys(LSL_Integer linkNumber, LSL_Integer type); LSL_List osGetInventoryNames(LSL_Integer type); LSL_List osGetLinkInventoryNames(LSL_Integer linkNumber, LSL_Integer type); diff --git a/bin/ScriptSyntax.xml b/bin/ScriptSyntax.xml index 0c2f7e57b4..94170c9d44 100644 --- a/bin/ScriptSyntax.xml +++ b/bin/ScriptSyntax.xml @@ -7318,7 +7318,7 @@ nametypestring -osGetLinkInventoryKey +osGetLinkInventoryItemKey returnkey arguments @@ -7326,7 +7326,7 @@ nametypestring - osGetInventoryKeys + osGetInventoryItemKeys returnlist arguments