* Implement full grid mode Trash empty

* Now, emptying the trash should remove folders and the items they contain as well as items which were not in a subfolder.
* This will only work once both the region and grid servers have reached this revision.
* You may also need to clear your cache before this will work
* Refactoring to follow.

1 files changed, 6 insertions, 7 deletions

diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 5cbfcf9..0528b91 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -259,13 +259,12 @@ namespace OpenSim.Framework.Communications
                 }
             }
 
-            // XXX Temporarily don't delete the items since UserProfileCacheService is still doing this
-//            List<InventoryItemBase> items = RequestFolderItems(folder.ID);
-//
-//            foreach (InventoryItemBase item : items)
-//            {
-//                DeleteItem(item);
-//            }
+            List<InventoryItemBase> items = RequestFolderItems(folder.ID);
+
+            foreach (InventoryItemBase item in items)
+            {
+                DeleteItem(item);
+            }
         }
         
         private void AddNewInventorySet(UsersInventory inventory)