diff options
Diffstat (limited to 'OpenSim/Services/InventoryService')
-rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 5 |
1 files changed, 3 insertions, 2 deletions
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 | |||
329 | if (!m_AllowDelete) | 329 | if (!m_AllowDelete) |
330 | return false; | 330 | return false; |
331 | 331 | ||
332 | if (!ParentIsTrash(folder.ID)) | 332 | // if (!ParentIsTrash(folder.ID)) |
333 | return false; | 333 | // return false; |
334 | 334 | ||
335 | XInventoryFolder[] subFolders = m_Database.GetFolders( | 335 | XInventoryFolder[] subFolders = m_Database.GetFolders( |
336 | new string[] { "parentFolderID" }, | 336 | new string[] { "parentFolderID" }, |
@@ -342,6 +342,7 @@ namespace OpenSim.Services.InventoryService | |||
342 | m_Database.DeleteFolders("folderID", x.folderID.ToString()); | 342 | m_Database.DeleteFolders("folderID", x.folderID.ToString()); |
343 | } | 343 | } |
344 | 344 | ||
345 | if (!ParentIsTrash(folder.ID)) | ||
345 | m_Database.DeleteItems("parentFolderID", folder.ID.ToString()); | 346 | m_Database.DeleteItems("parentFolderID", folder.ID.ToString()); |
346 | 347 | ||
347 | return true; | 348 | return true; |