Delete items as well as folders in XInventoryService.PurgeFolder - this should make emptying the trash work properly.

1 files changed, 11 insertions, 0 deletions

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;
         }