diff options
author | Justin Clarke Casey | 2008-04-23 22:13:57 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-04-23 22:13:57 +0000 |
commit | 40176c12f94044527e82972cbb72cce8caa5ce2b (patch) | |
tree | 6d917c2688a039bcc1b64b9699808f62dce4edec /OpenSim/Framework/Communications | |
parent | * Fixes lsl scripts with no state_entry event at all (diff) | |
download | opensim-SC-40176c12f94044527e82972cbb72cce8caa5ce2b.zip opensim-SC-40176c12f94044527e82972cbb72cce8caa5ce2b.tar.gz opensim-SC-40176c12f94044527e82972cbb72cce8caa5ce2b.tar.bz2 opensim-SC-40176c12f94044527e82972cbb72cce8caa5ce2b.tar.xz |
* Implement full grid mode Trash empty
* Now, emptying the trash should remove folders and the items they contain as well as items which were not in a subfolder.
* This will only work once both the region and grid servers have reached this revision.
* You may also need to clear your cache before this will work
* Refactoring to follow.
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | 9 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/InventoryServiceBase.cs | 13 |
2 files changed, 7 insertions, 15 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index 61ec483..1e3dbb6 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -523,14 +523,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
523 | purgedBaseFolder.Type = purgedFolder.Type; | 523 | purgedBaseFolder.Type = purgedFolder.Type; |
524 | purgedBaseFolder.Version = purgedFolder.Version; | 524 | purgedBaseFolder.Version = purgedFolder.Version; |
525 | 525 | ||
526 | m_commsManager.InventoryService.PurgeInventoryFolder(remoteClient.AgentId, purgedBaseFolder); | 526 | m_commsManager.InventoryService.PurgeInventoryFolder(remoteClient.AgentId, purgedBaseFolder); |
527 | |||
528 | // XXX Remains temporarily so that we still delete items in the grid case. | ||
529 | List<InventoryItemBase> items = purgedFolder.RequestListOfItems(); | ||
530 | foreach (InventoryItemBase item in items) | ||
531 | { | ||
532 | userProfile.DeleteItem(remoteClient.AgentId, item); | ||
533 | } | ||
534 | 527 | ||
535 | purgedFolder.Purge(); | 528 | purgedFolder.Purge(); |
536 | } | 529 | } |
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index 5cbfcf9..0528b91 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs | |||
@@ -259,13 +259,12 @@ namespace OpenSim.Framework.Communications | |||
259 | } | 259 | } |
260 | } | 260 | } |
261 | 261 | ||
262 | // XXX Temporarily don't delete the items since UserProfileCacheService is still doing this | 262 | List<InventoryItemBase> items = RequestFolderItems(folder.ID); |
263 | // List<InventoryItemBase> items = RequestFolderItems(folder.ID); | 263 | |
264 | // | 264 | foreach (InventoryItemBase item in items) |
265 | // foreach (InventoryItemBase item : items) | 265 | { |
266 | // { | 266 | DeleteItem(item); |
267 | // DeleteItem(item); | 267 | } |
268 | // } | ||
269 | } | 268 | } |
270 | 269 | ||
271 | private void AddNewInventorySet(UsersInventory inventory) | 270 | private void AddNewInventorySet(UsersInventory inventory) |