Delete items as well as folders in XInventoryService.PurgeFolder - this should make emptying the trash work properly.

avinationmerge
meta7 2010-08-20 11:25:31 -07:00
parent 187ccd72f0
commit b1790ba56e
1 changed files with 11 additions and 0 deletions

View File

@ -342,6 +342,17 @@ namespace OpenSim.Services.InventoryService
m_Database.DeleteFolders("folderID", x.folderID.ToString());
}
XInventoryItem[] items = m_Database.GetItems(
new string[] { "parentFolderID" },
new string[] { folder.ID.ToString() });
List<UUID> itemlist = new List<UUID>();
foreach (XInventoryItem i in items)
{
itemlist.Add(i.inventoryID);
}
DeleteItems(folder.Owner, itemlist);
return true;
}