aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/InventoryService/XInventoryService.cs
diff options
context:
space:
mode:
authorsacha2010-08-06 14:38:11 +0000
committersacha2010-08-06 14:38:11 +0000
commita390541e1c114db419d9a2eb1ac576a582c35e67 (patch)
tree8651f9e916ce755175fe4fa00c1d91ddd1cd4a18 /OpenSim/Services/InventoryService/XInventoryService.cs
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC-a390541e1c114db419d9a2eb1ac576a582c35e67.zip
opensim-SC-a390541e1c114db419d9a2eb1ac576a582c35e67.tar.gz
opensim-SC-a390541e1c114db419d9a2eb1ac576a582c35e67.tar.bz2
opensim-SC-a390541e1c114db419d9a2eb1ac576a582c35e67.tar.xz
Allowing the expected purge trash folder...
Please validate !!!
Diffstat (limited to 'OpenSim/Services/InventoryService/XInventoryService.cs')
-rw-r--r--OpenSim/Services/InventoryService/XInventoryService.cs5
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;