OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mantis 8411: fix send inventory item flags mask

0.9.1.0-post-fixes
UbitUmarov 2018-11-23 00:42:05 +00:00
parent 5951152082
commit 56845d4b75
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Capabilities/Handlers/FetchInventory/FetchInventory2Handler.cs
View File

@ -99,7 +99,7 @@ namespace OpenSim.Capabilities.Handlers
foreach (InventoryItemBase item in items) foreach (InventoryItemBase item in items)
{ {
if (item != null) if (item != null)
item.ToLLSDxml(lsl); item.ToLLSDxml(lsl, 0xff);
} }
LLSDxmlEncode.AddEndArray(lsl); LLSDxmlEncode.AddEndArray(lsl);
} }

20
OpenSim/Framework/InventoryItemBase.cs
View File

@ -417,7 +417,7 @@ namespace OpenSim.Framework
return MemberwiseClone(); return MemberwiseClone();
} }
public void ToLLSDxml(StringBuilder lsl) public void ToLLSDxml(StringBuilder lsl, uint flagsMask = 0xffffffff)
{ {
LLSDxmlEncode.AddMap(lsl); LLSDxmlEncode.AddMap(lsl);
LLSDxmlEncode.AddElem("parent_id", Folder, lsl); LLSDxmlEncode.AddElem("parent_id", Folder, lsl);
@ -433,21 +433,21 @@ namespace OpenSim.Framework
LLSDxmlEncode.AddElem("group_mask", (int)GroupPermissions, lsl); LLSDxmlEncode.AddElem("group_mask", (int)GroupPermissions, lsl);
LLSDxmlEncode.AddElem("everyone_mask", (int)EveryOnePermissions, lsl); LLSDxmlEncode.AddElem("everyone_mask", (int)EveryOnePermissions, lsl);
LLSDxmlEncode.AddElem("next_owner_mask", (int)NextPermissions, 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.AddEndMap(lsl);
LLSDxmlEncode.AddElem("type", AssetType, lsl); LLSDxmlEncode.AddElem("type", AssetType, lsl);
LLSDxmlEncode.AddElem("inv_type", InvType, lsl); LLSDxmlEncode.AddElem("inv_type", InvType, lsl);
LLSDxmlEncode.AddElem("flags", ((int)Flags) & 0xff, lsl); LLSDxmlEncode.AddElem("flags", (int)(Flags & flagsMask), lsl);
LLSDxmlEncode.AddMap("sale_info",lsl); LLSDxmlEncode.AddMap("sale_info",lsl);
LLSDxmlEncode.AddElem("sale_price", SalePrice, lsl); LLSDxmlEncode.AddElem("sale_price", SalePrice, lsl);
LLSDxmlEncode.AddElem("sale_type", SaleType, lsl); LLSDxmlEncode.AddElem("sale_type", SaleType, lsl);
LLSDxmlEncode.AddEndMap(lsl); LLSDxmlEncode.AddEndMap(lsl);
LLSDxmlEncode.AddElem("name", Name, lsl); LLSDxmlEncode.AddElem("name", Name, lsl);
LLSDxmlEncode.AddElem("desc", Description, lsl); LLSDxmlEncode.AddElem("desc", Description, lsl);
LLSDxmlEncode.AddElem("created_at", CreationDate, lsl); LLSDxmlEncode.AddElem("created_at", CreationDate, lsl);
LLSDxmlEncode.AddEndMap(lsl); LLSDxmlEncode.AddEndMap(lsl);
} }