mirror of
https://github.com/opensim/opensim.git
synced 2026-08-05 08:55:56 +08:00
delegate.BeginInvoke is a dead end
This commit is contained in:
@@ -684,8 +684,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||
}
|
||||
}
|
||||
|
||||
delegate void PurgeFolderDelegate(UUID userID, UUID folder);
|
||||
|
||||
/// <summary>
|
||||
/// This should delete all the items and folders in the given directory.
|
||||
/// </summary>
|
||||
@@ -693,10 +691,14 @@ namespace OpenSim.Region.Framework.Scenes
|
||||
/// <param name="folderID"></param>
|
||||
public void HandlePurgeInventoryDescendents(IClientAPI remoteClient, UUID folderID)
|
||||
{
|
||||
PurgeFolderDelegate d = PurgeFolderAsync;
|
||||
try
|
||||
{
|
||||
d.BeginInvoke(remoteClient.AgentId, folderID, PurgeFolderCompleted, d);
|
||||
UUID agent = remoteClient.AgentId;
|
||||
UUID folder = folderID;
|
||||
Util.FireAndForget(delegate
|
||||
{
|
||||
PurgeFolderAsync(agent, folder);
|
||||
});
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@@ -720,11 +722,5 @@ namespace OpenSim.Region.Framework.Scenes
|
||||
m_log.WarnFormat("[AGENT INVENTORY]: Exception on async purge folder for user {0}: {1}", userID, e.Message);
|
||||
}
|
||||
}
|
||||
|
||||
private void PurgeFolderCompleted(IAsyncResult iar)
|
||||
{
|
||||
PurgeFolderDelegate d = (PurgeFolderDelegate)iar.AsyncState;
|
||||
d.EndInvoke(iar);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user