diff options
author | Justin Clarke Casey | 2008-04-26 20:44:27 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-04-26 20:44:27 +0000 |
commit | b1632bd22203371a43db53812a4df5a2e878b66a (patch) | |
tree | dfca7fe3aa4e2cb9ba55f71a9fbac0be8da75d52 /OpenSim/Region/Environment/Scenes | |
parent | * First draft implementation of copying prim inventory items back to agent in... (diff) | |
download | opensim-SC-b1632bd22203371a43db53812a4df5a2e878b66a.zip opensim-SC-b1632bd22203371a43db53812a4df5a2e878b66a.tar.gz opensim-SC-b1632bd22203371a43db53812a4df5a2e878b66a.tar.bz2 opensim-SC-b1632bd22203371a43db53812a4df5a2e878b66a.tar.xz |
* Tidy up and comments related to last inventory related commit
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | 10 |
1 files changed, 5 insertions, 5 deletions
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 | |||
482 | public void RequestInventoryFile(IXfer xferManager) | 482 | public void RequestInventoryFile(IXfer xferManager) |
483 | { | 483 | { |
484 | byte[] fileData = new byte[0]; | 484 | byte[] fileData = new byte[0]; |
485 | //InventoryStringBuilder invString = new InventoryStringBuilder(m_folderID, UUID); | 485 | |
486 | // InventoryStringBuilder invString = new InventoryStringBuilder(UUID, LLUUID.Zero); | 486 | // Confusingly, the folder item has to be the object id, while the 'parent id' has to be zero. This matches |
487 | // what appears to happen in the Second Life protocol. If this isn't the case. then various functionality | ||
488 | // isn't available (such as drag from prim inventory to agent inventory) | ||
487 | InventoryStringBuilder invString = new InventoryStringBuilder(m_folderID, LLUUID.Zero); | 489 | InventoryStringBuilder invString = new InventoryStringBuilder(m_folderID, LLUUID.Zero); |
488 | 490 | ||
489 | lock (m_taskInventory) | 491 | lock (m_taskInventory) |
@@ -491,9 +493,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
491 | foreach (TaskInventoryItem item in m_taskInventory.Values) | 493 | foreach (TaskInventoryItem item in m_taskInventory.Values) |
492 | { | 494 | { |
493 | invString.AddItemStart(); | 495 | invString.AddItemStart(); |
494 | invString.AddNameValueLine("item_id", item.ItemID.ToString()); | 496 | invString.AddNameValueLine("item_id", item.ItemID.ToString()); |
495 | |||
496 | //invString.AddNameValueLine("parent_id", item.ParentID.ToString()); | ||
497 | invString.AddNameValueLine("parent_id", m_folderID.ToString()); | 497 | invString.AddNameValueLine("parent_id", m_folderID.ToString()); |
498 | 498 | ||
499 | invString.AddPermissionsStart(); | 499 | invString.AddPermissionsStart(); |