* First draft implementation of copying prim inventory items back to agent inventory

* Now, if you own an item in a prim, you should be able to successfully drag it back into your inventory
* Temporarily, users which are not owners of the item cannot copy it, even if 'everyone can copy' is set
* This is pending fixes/implementation of upstream permission implementation

2 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
index 7812499..33d820d 100644
--- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Framework.Communications.Cache
         }
 
         /// <summary>
-        /// Does this folder contain the given item?
+        /// Does this folder or any of its subfolders contain the given item?
         /// </summary>
         /// <param name="itemID"></param>
         /// <returns></returns>
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 388dfd7..dd0858a 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -408,6 +408,8 @@ namespace OpenSim.Framework
 
     public delegate void UpdateTaskInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID folderID, uint localID);
 
+    public delegate void MoveTaskInventory(IClientAPI remoteClient, LLUUID folderID, uint localID, LLUUID itemID);
+    
     public delegate void RemoveTaskInventory(IClientAPI remoteClient, LLUUID itemID, uint localID);
 
     public delegate void UDPAssetUploadRequest(
@@ -530,6 +532,7 @@ namespace OpenSim.Framework
         event ConfirmXfer OnConfirmXfer;
         event RezScript OnRezScript;
         event UpdateTaskInventory OnUpdateTaskInventory;
+        event MoveTaskInventory OnMoveTaskItem;
         event RemoveTaskInventory OnRemoveTaskItem;
         event RequestAsset OnRequestAsset;