From a390541e1c114db419d9a2eb1ac576a582c35e67 Mon Sep 17 00:00:00 2001
From: sacha
Date: Fri, 6 Aug 2010 14:38:11 +0000
Subject: Allowing the expected purge trash folder... Please validate !!!

---
 OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | 1 +
 OpenSim/Services/InventoryService/XInventoryService.cs     | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index ac6a3ab..e3d30e5 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -408,6 +408,7 @@ namespace OpenSim.Server.Handlers.Asset
 
         byte[] HandlePurgeFolder(Dictionary<string,object> request)
         {
+
             Dictionary<string,object> result = new Dictionary<string,object>();
             UUID folderID = UUID.Zero;
             UUID.TryParse(request["ID"].ToString(), out folderID);
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index f581f76..fc5020d 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -329,8 +329,8 @@ namespace OpenSim.Services.InventoryService
             if (!m_AllowDelete)
                 return false;
 
-            if (!ParentIsTrash(folder.ID))
-                return false;
+//            if (!ParentIsTrash(folder.ID))
+//                return false;
 
             XInventoryFolder[] subFolders = m_Database.GetFolders(
                     new string[] { "parentFolderID" },
@@ -342,6 +342,7 @@ namespace OpenSim.Services.InventoryService
                 m_Database.DeleteFolders("folderID", x.folderID.ToString());
             }
 
+	if (!ParentIsTrash(folder.ID))
             m_Database.DeleteItems("parentFolderID", folder.ID.ToString());
 
             return true;
-- 
cgit v1.1