diff options
| author | Melanie Thielker | 2010-08-06 15:18:48 +0200 |
|---|---|---|
| committer | Diva Canto | 2010-08-11 09:50:42 -0700 |
| commit | 8b7e006ed00e370ea3ed3d1776bfcd46c953598b (patch) | |
| tree | 0376b8f7f076e4c297c96237ecbfef290f4c968f | |
| parent | Prevent setting the hovertext from firing changed_color (diff) | |
| download | opensim-SC-8b7e006ed00e370ea3ed3d1776bfcd46c953598b.zip opensim-SC-8b7e006ed00e370ea3ed3d1776bfcd46c953598b.tar.gz opensim-SC-8b7e006ed00e370ea3ed3d1776bfcd46c953598b.tar.bz2 opensim-SC-8b7e006ed00e370ea3ed3d1776bfcd46c953598b.tar.xz | |
Allow the trash folder itself to be passed to PurgeFolder
| -rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 3 |
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) |