aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2010-08-06 15:18:48 +0200
committerMelanie2010-08-06 15:04:25 +0100
commitf809797d62a8d3862459fb7398e2ec870cafdcf5 (patch)
tree23457865a448de25aca8a2b1b7216f4b05311b78 /OpenSim
parentPrevent users from becoming stuck online. This affects only 0.7 (diff)
downloadopensim-SC_OLD-f809797d62a8d3862459fb7398e2ec870cafdcf5.zip
opensim-SC_OLD-f809797d62a8d3862459fb7398e2ec870cafdcf5.tar.gz
opensim-SC_OLD-f809797d62a8d3862459fb7398e2ec870cafdcf5.tar.bz2
opensim-SC_OLD-f809797d62a8d3862459fb7398e2ec870cafdcf5.tar.xz
Allow the trash folder itself to be passed to PurgeFolder
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/InventoryService/XInventoryService.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index f581f76..f63ab16 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -542,6 +542,9 @@ namespace OpenSim.Services.InventoryService
542 if (folder.Length < 1) 542 if (folder.Length < 1)
543 return false; 543 return false;
544 544
545 if (folder[0].type == (int)AssetType.TrashFolder)
546 return true;
547
545 UUID parentFolder = folder[0].parentFolderID; 548 UUID parentFolder = folder[0].parentFolderID;
546 549
547 while (parentFolder != UUID.Zero) 550 while (parentFolder != UUID.Zero)