mirror of
https://github.com/opensim/opensim.git
synced 2026-08-01 22:26:09 +08:00
* Fixes mantis http://opensimulator.org/mantis/view.php?id=4044. Turns out folders were never being removed from trash when they were singled out for purging in trash. They were being removed when Trash was purged as a whole. That behavior is now fixed for the new InventoryService set.
* Removed left-overs from AssetInventoryServer.
This commit is contained in:
@@ -7090,14 +7090,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||
if (OnRemoveInventoryFolder != null)
|
||||
{
|
||||
handlerRemoveInventoryFolder = null;
|
||||
List<UUID> uuids = new List<UUID>();
|
||||
foreach (RemoveInventoryFolderPacket.FolderDataBlock datablock in removeFolder.FolderData)
|
||||
{
|
||||
handlerRemoveInventoryFolder = OnRemoveInventoryFolder;
|
||||
|
||||
if (handlerRemoveInventoryFolder != null)
|
||||
{
|
||||
handlerRemoveInventoryFolder(this, datablock.FolderID);
|
||||
}
|
||||
uuids.Add(datablock.FolderID);
|
||||
}
|
||||
handlerRemoveInventoryFolder = OnRemoveInventoryFolder;
|
||||
if (handlerRemoveInventoryFolder != null)
|
||||
{
|
||||
handlerRemoveInventoryFolder(this, uuids);
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -7114,14 +7115,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||
if (OnRemoveInventoryFolder != null)
|
||||
{
|
||||
handlerRemoveInventoryFolder = null;
|
||||
List<UUID> uuids = new List<UUID>();
|
||||
foreach (RemoveInventoryObjectsPacket.FolderDataBlock datablock in removeObject.FolderData)
|
||||
{
|
||||
handlerRemoveInventoryFolder = OnRemoveInventoryFolder;
|
||||
|
||||
if (handlerRemoveInventoryFolder != null)
|
||||
{
|
||||
handlerRemoveInventoryFolder(this, datablock.FolderID);
|
||||
}
|
||||
uuids.Add(datablock.FolderID);
|
||||
}
|
||||
handlerRemoveInventoryFolder = OnRemoveInventoryFolder;
|
||||
if (handlerRemoveInventoryFolder != null)
|
||||
{
|
||||
handlerRemoveInventoryFolder(this, uuids);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user