Added MoveItems, which is most useful upon viewer-delete inventory operation. Moving a batch of items is a 1-time operation. Made it async anyway, so that the viewer doesn't wait in case the DB layer is dumb (which is the case currently).

6 files changed, 82 insertions, 0 deletions

diff --git a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
index 00b74b5..45e921a 100644
--- a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
@@ -253,6 +253,19 @@ namespace OpenSim.Services.Connectors.Inventory
             return false;
         }
 
+        public bool MoveItems(string id, List<InventoryItemBase> items, UUID sessionID)
+        {
+            string url = string.Empty;
+            string userID = string.Empty;
+
+            if (StringToUrlAndUserID(id, out url, out userID))
+            {
+                ISessionAuthInventoryService connector = GetConnector(url);
+                return connector.MoveItems(userID, items, sessionID);
+            }
+            return false;
+        }
+
         public bool DeleteItems(string id, List<UUID> itemIDs, UUID sessionID)
         {
             string url = string.Empty;
diff --git a/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs b/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
index e4e713c..c89c9b7 100644
--- a/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
+++ b/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
@@ -116,6 +116,8 @@ 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>
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index 9b2e331..bcf9d87 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -383,6 +383,48 @@ namespace OpenSim.Services.Connectors
             return false;
         }
 
+        /**
+         * MoveItems Async group
+         */
+
+        delegate void MoveItemsDelegate(string userID, List<InventoryItemBase> items, UUID sessionID);
+
+        private void MoveItemsAsync(string userID, List<InventoryItemBase> items, UUID sessionID)
+        {
+            try
+            {
+                SynchronousRestSessionObjectPoster<List<InventoryItemBase>, bool>.BeginPostObject(
+                    "POST", m_ServerURI + "/MoveItems/", items, sessionID.ToString(), userID.ToString());
+
+                // Success
+                return;
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[INVENTORY CONNECTOR]: Move inventory items operation failed, {0} {1} (old server?). Trying slow way.",
+                     e.Source, e.Message);
+            }
+
+            foreach (InventoryItemBase item in items)
+            {
+                InventoryItemBase itm = this.QueryItem(userID, item, sessionID);
+                itm.Name = item.Name;
+                itm.Folder = item.Folder;
+                this.UpdateItem(userID, itm, sessionID);
+            }
+        }
+
+        private void MoveItemsCompleted(IAsyncResult iar)
+        {
+        }
+
+        public bool MoveItems(string userID, List<InventoryItemBase> items, UUID sessionID)
+        {
+            MoveItemsDelegate d = MoveItemsAsync;
+            d.BeginInvoke(userID, items, sessionID, MoveItemsCompleted, d);
+            return true;
+        }
+
         public bool DeleteItems(string userID, List<UUID> items, UUID sessionID)
         {
             try
diff --git a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
index 3bbf129..cd283ff 100644
--- a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
@@ -151,6 +151,11 @@ namespace OpenSim.Services.Connectors
             return false;
         }
 
+        public bool MoveItems(UUID ownerID, List<InventoryItemBase> items)
+        {
+            return false;
+        }
+
         public bool DeleteItems(UUID owner, List<UUID> itemIDs)
         {
             return false;
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs
index 6409b57..ebdb09a 100644
--- a/OpenSim/Services/Interfaces/IInventoryService.cs
+++ b/OpenSim/Services/Interfaces/IInventoryService.cs
@@ -142,6 +142,8 @@ namespace OpenSim.Services.Interfaces
         /// <returns>true if the item was successfully updated</returns>
         bool UpdateItem(InventoryItemBase item);
 
+        bool MoveItems(UUID ownerID, List<InventoryItemBase> items);
+
         /// <summary>
         /// Delete an item from the user's inventory
         /// </summary>
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index 69b1b28..e0217f6 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -386,6 +386,24 @@ namespace OpenSim.Services.InventoryService
             return true;
         }
 
+        public virtual bool MoveItems(UUID ownerID, List<InventoryItemBase> items)
+        {
+            m_log.InfoFormat(
+                "[INVENTORY SERVICE]: Moving {0} items from user {1}", items.Count, ownerID);
+
+            InventoryItemBase itm = null;
+            foreach (InventoryItemBase item in items)
+            {
+                itm = GetInventoryItem(item.ID);
+                itm.Folder = item.Folder;
+                if ((item.Name != null) && !item.Name.Equals(string.Empty))
+                    itm.Name = item.Name;
+                m_Database.updateInventoryItem(itm);
+            }
+
+            return true;
+        }
+
         // See IInventoryServices
         public virtual bool DeleteItems(UUID owner, List<UUID> itemIDs)
         {