diff options
| author | sacha | 2010-08-06 14:45:54 +0000 |
|---|---|---|
| committer | sacha | 2010-08-06 14:45:54 +0000 |
| commit | 5da272d0425cc6a971b60a1e5fad556d4d66eb52 (patch) | |
| tree | 9306f31a99ff2ad60d2556b6a5518cac200b064b | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| download | opensim-SC-5da272d0425cc6a971b60a1e5fad556d4d66eb52.zip opensim-SC-5da272d0425cc6a971b60a1e5fad556d4d66eb52.tar.gz opensim-SC-5da272d0425cc6a971b60a1e5fad556d4d66eb52.tar.bz2 opensim-SC-5da272d0425cc6a971b60a1e5fad556d4d66eb52.tar.xz | |
reverese my last commit
| -rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs index fc5020d..541489f 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,8 +342,6 @@ 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)) | ||
| 346 | m_Database.DeleteItems("parentFolderID", folder.ID.ToString()); | ||
| 347 | 345 | ||
| 348 | return true; | 346 | return true; |
| 349 | } | 347 | } |