diff options
| author | UbitUmarov | 2018-11-23 00:42:05 +0000 |
|---|---|---|
| committer | UbitUmarov | 2018-11-23 00:42:05 +0000 |
| commit | 56845d4b75ecd2d576aa117523d1dac500e9c233 (patch) | |
| tree | 2f8ba1cdec1cb77eebe7b7051b6077a5c162cd0d /OpenSim/Framework | |
| parent | Yengine: try read XEngine state from wire (diff) | |
| download | opensim-SC-56845d4b75ecd2d576aa117523d1dac500e9c233.zip opensim-SC-56845d4b75ecd2d576aa117523d1dac500e9c233.tar.gz opensim-SC-56845d4b75ecd2d576aa117523d1dac500e9c233.tar.bz2 opensim-SC-56845d4b75ecd2d576aa117523d1dac500e9c233.tar.xz | |
mantis 8411: fix send inventory item flags mask
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/InventoryItemBase.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs index b7f27bd..dcf078c 100644 --- a/OpenSim/Framework/InventoryItemBase.cs +++ b/OpenSim/Framework/InventoryItemBase.cs | |||
| @@ -417,7 +417,7 @@ namespace OpenSim.Framework | |||
| 417 | return MemberwiseClone(); | 417 | return MemberwiseClone(); |
| 418 | } | 418 | } |
| 419 | 419 | ||
| 420 | public void ToLLSDxml(StringBuilder lsl) | 420 | public void ToLLSDxml(StringBuilder lsl, uint flagsMask = 0xffffffff) |
| 421 | { | 421 | { |
| 422 | LLSDxmlEncode.AddMap(lsl); | 422 | LLSDxmlEncode.AddMap(lsl); |
| 423 | LLSDxmlEncode.AddElem("parent_id", Folder, lsl); | 423 | LLSDxmlEncode.AddElem("parent_id", Folder, lsl); |
| @@ -433,21 +433,21 @@ namespace OpenSim.Framework | |||
| 433 | LLSDxmlEncode.AddElem("group_mask", (int)GroupPermissions, lsl); | 433 | LLSDxmlEncode.AddElem("group_mask", (int)GroupPermissions, lsl); |
| 434 | LLSDxmlEncode.AddElem("everyone_mask", (int)EveryOnePermissions, lsl); | 434 | LLSDxmlEncode.AddElem("everyone_mask", (int)EveryOnePermissions, lsl); |
| 435 | LLSDxmlEncode.AddElem("next_owner_mask", (int)NextPermissions, lsl); | 435 | LLSDxmlEncode.AddElem("next_owner_mask", (int)NextPermissions, lsl); |
| 436 | LLSDxmlEncode.AddElem("is_owner_group", GroupOwned, lsl); | 436 | LLSDxmlEncode.AddElem("is_owner_group", GroupOwned, lsl); |
| 437 | LLSDxmlEncode.AddEndMap(lsl); | 437 | LLSDxmlEncode.AddEndMap(lsl); |
| 438 | 438 | ||
| 439 | LLSDxmlEncode.AddElem("type", AssetType, lsl); | 439 | LLSDxmlEncode.AddElem("type", AssetType, lsl); |
| 440 | LLSDxmlEncode.AddElem("inv_type", InvType, lsl); | 440 | LLSDxmlEncode.AddElem("inv_type", InvType, lsl); |
| 441 | LLSDxmlEncode.AddElem("flags", ((int)Flags) & 0xff, lsl); | 441 | LLSDxmlEncode.AddElem("flags", (int)(Flags & flagsMask), lsl); |
| 442 | 442 | ||
| 443 | LLSDxmlEncode.AddMap("sale_info",lsl); | 443 | LLSDxmlEncode.AddMap("sale_info",lsl); |
| 444 | LLSDxmlEncode.AddElem("sale_price", SalePrice, lsl); | 444 | LLSDxmlEncode.AddElem("sale_price", SalePrice, lsl); |
| 445 | LLSDxmlEncode.AddElem("sale_type", SaleType, lsl); | 445 | LLSDxmlEncode.AddElem("sale_type", SaleType, lsl); |
| 446 | LLSDxmlEncode.AddEndMap(lsl); | 446 | LLSDxmlEncode.AddEndMap(lsl); |
| 447 | 447 | ||
| 448 | LLSDxmlEncode.AddElem("name", Name, lsl); | 448 | LLSDxmlEncode.AddElem("name", Name, lsl); |
| 449 | LLSDxmlEncode.AddElem("desc", Description, lsl); | 449 | LLSDxmlEncode.AddElem("desc", Description, lsl); |
| 450 | LLSDxmlEncode.AddElem("created_at", CreationDate, lsl); | 450 | LLSDxmlEncode.AddElem("created_at", CreationDate, lsl); |
| 451 | 451 | ||
| 452 | LLSDxmlEncode.AddEndMap(lsl); | 452 | LLSDxmlEncode.AddEndMap(lsl); |
| 453 | } | 453 | } |