From abc06daefdd671d846da7d3bd911e3e6db09aa01 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Fri, 16 May 2008 22:57:46 +0000 Subject: * Patch from Melanie. Mantis 1294: Fix broken wearables icon display in prim inventories. From Melanie! Thanks Melanie. --- OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | 7 ++++++- OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs index 1ac51a6..b24e0de 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs @@ -205,7 +205,12 @@ namespace OpenSim.Region.Environment.Scenes // FIXME: ignoring group permissions for now as they aren't stored in item taskItem.EveryoneMask = item.EveryOnePermissions; taskItem.NextOwnerMask = item.NextPermissions; - + taskItem.Flags = item.Flags; + // TODO: These are pending addition of those fields to TaskInventoryItem +// taskItem.SalePrice = item.SalePrice; +// taskItem.SaleType = item.SaleType; + taskItem.CreationDate = (uint)item.CreationDate; + part.AddInventoryItem(taskItem); return true; diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs index cce263c..b151d75 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs @@ -509,7 +509,7 @@ namespace OpenSim.Region.Environment.Scenes invString.AddNameValueLine("asset_id", item.AssetID.ToString()); invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]); invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]); - invString.AddNameValueLine("flags", "00000000"); + invString.AddNameValueLine("flags", Helpers.UIntToHexString(item.Flags)); invString.AddSaleStart(); invString.AddNameValueLine("sale_type", "not"); -- cgit v1.1