From 5da272d0425cc6a971b60a1e5fad556d4d66eb52 Mon Sep 17 00:00:00 2001
From: sacha
Date: Fri, 6 Aug 2010 14:45:54 +0000
Subject: reverese my last commit

---
 OpenSim/Services/InventoryService/XInventoryService.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index fc5020d..541489f 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,8 +342,6 @@ 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