diff options
| author | Melanie Thielker | 2010-08-20 18:53:33 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-08-20 18:53:33 +0200 |
| commit | 47080834346b2528a65e5b4d5e59130206b0cb83 (patch) | |
| tree | 39442cbc7f5ab1579a9fff29270b555376f721ed | |
| parent | Delete items as well as folders in XInventoryService.PurgeFolder - this shoul... (diff) | |
| download | opensim-SC_OLD-47080834346b2528a65e5b4d5e59130206b0cb83.zip opensim-SC_OLD-47080834346b2528a65e5b4d5e59130206b0cb83.tar.gz opensim-SC_OLD-47080834346b2528a65e5b4d5e59130206b0cb83.tar.bz2 opensim-SC_OLD-47080834346b2528a65e5b4d5e59130206b0cb83.tar.xz | |
Use the database mthod directly to delete items in a single sql swoop
| -rw-r--r-- | OpenSim/Services/InventoryService/XInventoryService.cs | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs index e3f0a19..3efdce4 100644 --- a/OpenSim/Services/InventoryService/XInventoryService.cs +++ b/OpenSim/Services/InventoryService/XInventoryService.cs | |||
| @@ -342,17 +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 | XInventoryItem[] items = m_Database.GetItems( | 345 | m_Database.DeleteItems("parentFolderID", folder.id.ToString()); |
| 346 | new string[] { "parentFolderID" }, | ||
| 347 | new string[] { folder.ID.ToString() }); | ||
| 348 | |||
| 349 | List<UUID> itemlist = new List<UUID>(); | ||
| 350 | foreach (XInventoryItem i in items) | ||
| 351 | { | ||
| 352 | itemlist.Add(i.inventoryID); | ||
| 353 | } | ||
| 354 | |||
| 355 | DeleteItems(folder.Owner, itemlist); | ||
| 356 | 346 | ||
| 357 | return true; | 347 | return true; |
| 358 | } | 348 | } |