diff options
| author | Melanie Thielker | 2010-08-06 15:18:48 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-08-06 15:18:48 +0200 |
| commit | 42613ec53602093335ebe3ce5127d797318bdf23 (patch) | |
| tree | ba6df3160e75a9d13b2aa86cce0cf75bb93155a4 | |
| parent | reverese my last commit (diff) | |
| download | opensim-SC_OLD-42613ec53602093335ebe3ce5127d797318bdf23.zip opensim-SC_OLD-42613ec53602093335ebe3ce5127d797318bdf23.tar.gz opensim-SC_OLD-42613ec53602093335ebe3ce5127d797318bdf23.tar.bz2 opensim-SC_OLD-42613ec53602093335ebe3ce5127d797318bdf23.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 541489f..26c5b33 100644 --- a/OpenSim/Services/InventoryService/XInventoryService.cs +++ b/OpenSim/Services/InventoryService/XInventoryService.cs | |||
| @@ -541,6 +541,9 @@ namespace OpenSim.Services.InventoryService | |||
| 541 | if (folder.Length < 1) | 541 | if (folder.Length < 1) |
| 542 | return false; | 542 | return false; |
| 543 | 543 | ||
| 544 | if (folder[0].type == (int)AssetType.TrashFolder) | ||
| 545 | return true; | ||
| 546 | |||
| 544 | UUID parentFolder = folder[0].parentFolderID; | 547 | UUID parentFolder = folder[0].parentFolderID; |
| 545 | 548 | ||
| 546 | while (parentFolder != UUID.Zero) | 549 | while (parentFolder != UUID.Zero) |