Merge git://opensimulator.org/git/opensim

1 files changed, 17 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs
index 05fc2ad..305975e 100644
--- a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs
@@ -38,7 +38,23 @@ namespace OpenSim.Region.Framework.Interfaces
     public interface IInventoryAccessModule
     {
         UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data);
-        UUID DeleteToInventory(DeRezAction action, UUID folderID, List<SceneObjectGroup> objectGroups, IClientAPI remoteClient);
+        
+        /// <summary>
+        /// Copy objects to a user's inventory.
+        /// </summary>
+        /// <remarks>
+        /// Is it left to the caller to delete them from the scene if required.
+        /// </remarks>
+        /// <param name="action"></param>
+        /// <param name="folderID"></param>
+        /// <param name="objectGroups"></param>
+        /// <param name="remoteClient"></param>
+        /// <returns>
+        /// Returns the UUID of the newly created item asset (not the item itself).
+        /// FIXME: This is not very useful.  It would be far more useful to return a list of items instead.
+        /// </returns>
+        UUID CopyToInventory(DeRezAction action, UUID folderID, List<SceneObjectGroup> objectGroups, IClientAPI remoteClient);
+        
         SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
                                     UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
                                     bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment);