Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

1 files changed, 3 insertions, 1 deletions

diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index f581f76..26c5b33 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -342,7 +342,6 @@ namespace OpenSim.Services.InventoryService
                 m_Database.DeleteFolders("folderID", x.folderID.ToString());
             }
 
-            m_Database.DeleteItems("parentFolderID", folder.ID.ToString());
 
             return true;
         }
@@ -542,6 +541,9 @@ namespace OpenSim.Services.InventoryService
             if (folder.Length < 1)
                 return false;
 
+            if (folder[0].type == (int)AssetType.TrashFolder)
+                return true;
+
             UUID parentFolder = folder[0].parentFolderID;
 
             while (parentFolder != UUID.Zero)