A better purge of trash folder.

3 files changed, 5 insertions, 3 deletions

diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index ca641d0..238810a 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -653,7 +653,9 @@ namespace OpenSim.Framework.Communications.Cache
 
                 if (RootFolder.DeleteItem(item.ID))
                 {
-                    return m_InventoryService.DeleteItem(item);
+                    List<UUID> uuids = new List<UUID>();
+                    uuids.Add(itemID);
+                    return m_InventoryService.DeleteItems(this.UserProfile.ID, uuids);
                 }
             }
             else
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index 22dcef9..d5d4d1e 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -547,7 +547,7 @@ namespace OpenSim.Framework.Communications.Tests
             return false;
         }
 
-        public bool DeleteItem(InventoryItemBase item)
+        public bool DeleteItems(UUID owner, List<UUID> items)
         {
             return false;
         }
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index e451dd8..ca37a5b 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -257,7 +257,7 @@ namespace OpenSim.Framework
         IClientAPI remoteClient, UUID folderID, UUID itemID, int length, string newName);
 
     public delegate void RemoveInventoryItem(
-        IClientAPI remoteClient, UUID itemID);
+        IClientAPI remoteClient, List<UUID> itemIDs);
 
     public delegate void RemoveInventoryFolder(
         IClientAPI remoteClient, UUID folderID);