Merge branch 'master' of ssh://MyConnection/var/git/opensim

1 files changed, 10 insertions, 1 deletions

diff --git a/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs b/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
index f50bcf5..c89c9b7 100644
--- a/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
+++ b/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
@@ -96,6 +96,13 @@ namespace OpenSim.Services.Connectors
         bool PurgeFolder(string userID, InventoryFolderBase folder, UUID session_id);
 
         /// <summary>
+        /// Get items from a folder.
+        /// </summary>
+        /// <param name="folder"></param>
+        /// <returns>true if the folder was successfully purged</returns>
+        List<InventoryItemBase> GetFolderItems(string userID, UUID folderID, UUID session_id);
+
+        /// <summary>
         /// Add a new item to the user's inventory
         /// </summary>
         /// <param name="item"></param>
@@ -109,12 +116,14 @@ namespace OpenSim.Services.Connectors
         /// <returns>true if the item was successfully updated</returns>
         bool UpdateItem(string userID, InventoryItemBase item, UUID session_id);
 
+        bool MoveItems(string userID, List<InventoryItemBase> items, UUID session_id);
+        
         /// <summary>
         /// Delete an item from the user's inventory
         /// </summary>
         /// <param name="item"></param>
         /// <returns>true if the item was successfully deleted</returns>
-        bool DeleteItem(string userID, InventoryItemBase item, UUID session_id);
+        bool DeleteItems(string userID, List<UUID> itemIDs, UUID session_id);
 
         InventoryItemBase QueryItem(string userID, InventoryItemBase item, UUID session_id);