From b1790ba56ec4ee61a2df6747b1fa42ae0c37da15 Mon Sep 17 00:00:00 2001
From: meta7
Date: Fri, 20 Aug 2010 11:25:31 -0700
Subject: Delete items as well as folders in XInventoryService.PurgeFolder -
 this should make emptying the trash work properly.

---
 OpenSim/Services/InventoryService/XInventoryService.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'OpenSim/Services/InventoryService')

diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index 26c5b33..e3f0a19 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -342,6 +342,17 @@ namespace OpenSim.Services.InventoryService
                 m_Database.DeleteFolders("folderID", x.folderID.ToString());
             }
 
+            XInventoryItem[] items = m_Database.GetItems(
+                    new string[] { "parentFolderID" },
+                    new string[] { folder.ID.ToString() });
+
+            List<UUID> itemlist = new List<UUID>();
+            foreach (XInventoryItem i in items)
+            {
+                itemlist.Add(i.inventoryID);
+            }
+
+            DeleteItems(folder.Owner, itemlist);
 
             return true;
         }
-- 
cgit v1.1