From b1632bd22203371a43db53812a4df5a2e878b66a Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Sat, 26 Apr 2008 20:44:27 +0000 Subject: * Tidy up and comments related to last inventory related commit --- OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region/Environment') diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs index 89c93fd..42047ad 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs @@ -482,8 +482,10 @@ namespace OpenSim.Region.Environment.Scenes public void RequestInventoryFile(IXfer xferManager) { byte[] fileData = new byte[0]; - //InventoryStringBuilder invString = new InventoryStringBuilder(m_folderID, UUID); -// InventoryStringBuilder invString = new InventoryStringBuilder(UUID, LLUUID.Zero); + + // Confusingly, the folder item has to be the object id, while the 'parent id' has to be zero. This matches + // what appears to happen in the Second Life protocol. If this isn't the case. then various functionality + // isn't available (such as drag from prim inventory to agent inventory) InventoryStringBuilder invString = new InventoryStringBuilder(m_folderID, LLUUID.Zero); lock (m_taskInventory) @@ -491,9 +493,7 @@ namespace OpenSim.Region.Environment.Scenes foreach (TaskInventoryItem item in m_taskInventory.Values) { invString.AddItemStart(); - invString.AddNameValueLine("item_id", item.ItemID.ToString()); - - //invString.AddNameValueLine("parent_id", item.ParentID.ToString()); + invString.AddNameValueLine("item_id", item.ItemID.ToString()); invString.AddNameValueLine("parent_id", m_folderID.ToString()); invString.AddPermissionsStart(); -- cgit v1.1