Delete items as well as folders in XInventoryService.PurgeFolder - this should make emptying the trash work properly.
parent
187ccd72f0
commit
b1790ba56e
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue