aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs9
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs13
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)