From 56845d4b75ecd2d576aa117523d1dac500e9c233 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 23 Nov 2018 00:42:05 +0000 Subject: [PATCH] mantis 8411: fix send inventory item flags mask --- .../FetchInventory/FetchInventory2Handler.cs | 2 +- OpenSim/Framework/InventoryItemBase.cs | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs index bae4cf60c8..e25ead45fa 100644 --- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs +++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs @@ -99,7 +99,7 @@ namespace OpenSim.Capabilities.Handlers foreach (InventoryItemBase item in items) { if (item != null) - item.ToLLSDxml(lsl); + item.ToLLSDxml(lsl, 0xff); } LLSDxmlEncode.AddEndArray(lsl); } diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs index b7f27bdade..dcf078c86d 100644 --- a/OpenSim/Framework/InventoryItemBase.cs +++ b/OpenSim/Framework/InventoryItemBase.cs @@ -417,7 +417,7 @@ namespace OpenSim.Framework return MemberwiseClone(); } - public void ToLLSDxml(StringBuilder lsl) + public void ToLLSDxml(StringBuilder lsl, uint flagsMask = 0xffffffff) { LLSDxmlEncode.AddMap(lsl); LLSDxmlEncode.AddElem("parent_id", Folder, lsl); @@ -433,21 +433,21 @@ namespace OpenSim.Framework LLSDxmlEncode.AddElem("group_mask", (int)GroupPermissions, lsl); LLSDxmlEncode.AddElem("everyone_mask", (int)EveryOnePermissions, lsl); LLSDxmlEncode.AddElem("next_owner_mask", (int)NextPermissions, lsl); - LLSDxmlEncode.AddElem("is_owner_group", GroupOwned, lsl); + LLSDxmlEncode.AddElem("is_owner_group", GroupOwned, lsl); LLSDxmlEncode.AddEndMap(lsl); - LLSDxmlEncode.AddElem("type", AssetType, lsl); - LLSDxmlEncode.AddElem("inv_type", InvType, lsl); - LLSDxmlEncode.AddElem("flags", ((int)Flags) & 0xff, lsl); + LLSDxmlEncode.AddElem("type", AssetType, lsl); + LLSDxmlEncode.AddElem("inv_type", InvType, lsl); + LLSDxmlEncode.AddElem("flags", (int)(Flags & flagsMask), lsl); LLSDxmlEncode.AddMap("sale_info",lsl); - LLSDxmlEncode.AddElem("sale_price", SalePrice, lsl); - LLSDxmlEncode.AddElem("sale_type", SaleType, lsl); + LLSDxmlEncode.AddElem("sale_price", SalePrice, lsl); + LLSDxmlEncode.AddElem("sale_type", SaleType, lsl); LLSDxmlEncode.AddEndMap(lsl); - LLSDxmlEncode.AddElem("name", Name, lsl); - LLSDxmlEncode.AddElem("desc", Description, lsl); - LLSDxmlEncode.AddElem("created_at", CreationDate, lsl); + LLSDxmlEncode.AddElem("name", Name, lsl); + LLSDxmlEncode.AddElem("desc", Description, lsl); + LLSDxmlEncode.AddElem("created_at", CreationDate, lsl); LLSDxmlEncode.AddEndMap(lsl); }