aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-16 22:57:46 +0000
committerTeravus Ovares2008-05-16 22:57:46 +0000
commitabc06daefdd671d846da7d3bd911e3e6db09aa01 (patch)
tree9061253243ef5686e6ea4a61a8bfca5b67e13a0b
parent* Applying patch in mantis 0001293: [PATCH] Fix a bug that corrupts uploaded ... (diff)
downloadopensim-SC_OLD-abc06daefdd671d846da7d3bd911e3e6db09aa01.zip
opensim-SC_OLD-abc06daefdd671d846da7d3bd911e3e6db09aa01.tar.gz
opensim-SC_OLD-abc06daefdd671d846da7d3bd911e3e6db09aa01.tar.bz2
opensim-SC_OLD-abc06daefdd671d846da7d3bd911e3e6db09aa01.tar.xz
* Patch from Melanie. Mantis 1294: Fix broken wearables icon display in prim inventories. From Melanie! Thanks Melanie.
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs7
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs2
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
205 // FIXME: ignoring group permissions for now as they aren't stored in item 205 // FIXME: ignoring group permissions for now as they aren't stored in item
206 taskItem.EveryoneMask = item.EveryOnePermissions; 206 taskItem.EveryoneMask = item.EveryOnePermissions;
207 taskItem.NextOwnerMask = item.NextPermissions; 207 taskItem.NextOwnerMask = item.NextPermissions;
208 208 taskItem.Flags = item.Flags;
209 // TODO: These are pending addition of those fields to TaskInventoryItem
210// taskItem.SalePrice = item.SalePrice;
211// taskItem.SaleType = item.SaleType;
212 taskItem.CreationDate = (uint)item.CreationDate;
213
209 part.AddInventoryItem(taskItem); 214 part.AddInventoryItem(taskItem);
210 215
211 return true; 216 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
509 invString.AddNameValueLine("asset_id", item.AssetID.ToString()); 509 invString.AddNameValueLine("asset_id", item.AssetID.ToString());
510 invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]); 510 invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
511 invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]); 511 invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
512 invString.AddNameValueLine("flags", "00000000"); 512 invString.AddNameValueLine("flags", Helpers.UIntToHexString(item.Flags));
513 513
514 invString.AddSaleStart(); 514 invString.AddSaleStart();
515 invString.AddNameValueLine("sale_type", "not"); 515 invString.AddNameValueLine("sale_type", "not");