From c5af39239f7f2a1725d9c08bea80522de8835e0f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 19 Aug 2009 00:13:51 -0700
Subject: A better purge of trash folder.

---
 OpenSim/Services/InventoryService/InventoryService.cs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Services/InventoryService')

diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index 65c2d96..69b1b28 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -387,12 +387,14 @@ namespace OpenSim.Services.InventoryService
         }
 
         // See IInventoryServices
-        public virtual bool DeleteItem(InventoryItemBase item)
+        public virtual bool DeleteItems(UUID owner, List<UUID> itemIDs)
         {
             m_log.InfoFormat(
-                "[INVENTORY SERVICE]: Deleting item {0} {1} from folder {2}", item.Name, item.ID, item.Folder);
+                "[INVENTORY SERVICE]: Deleting {0} items from user {1}", itemIDs.Count, owner);
 
-            m_Database.deleteInventoryItem(item.ID);
+            // uhh.....
+            foreach (UUID uuid in itemIDs)
+                m_Database.deleteInventoryItem(uuid);
 
             // FIXME: Should return false on failure
             return true;
@@ -439,10 +441,12 @@ namespace OpenSim.Services.InventoryService
 
             List<InventoryItemBase> items = GetFolderItems(folder.Owner, folder.ID);
 
+            List<UUID> uuids = new List<UUID>();
             foreach (InventoryItemBase item in items)
             {
-                DeleteItem(item);
+                uuids.Add(item.ID);
             }
+            DeleteItems(folder.Owner, uuids);
 
             // FIXME: Should return false on failure
             return true;
-- 
cgit v1.1