ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

Browse Source
This commit is contained in:
Melanie
2009-09-03 21:04:06 +01:00
parent 328fd104e1 639bf79aec
commit 5c2bf97bf2
16 changed files with 114 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
View File

@@ -177,7 +177,7 @@ namespace OpenSim.Services.Connectors
}
else
{
handler.BeginInvoke(id, sender, asset, null, null);
Util.FireAndForget(delegate { handler(id, sender, asset); });
}
return true;

2
OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
View File

@@ -461,6 +461,8 @@ namespace OpenSim.Services.Connectors
private void MoveItemsCompleted(IAsyncResult iar)
{
MoveItemsDelegate d = (MoveItemsDelegate)iar.AsyncState;
d.EndInvoke(iar);
}
public bool MoveItems(string userID, List<InventoryItemBase> items, UUID sessionID)

2
OpenSim/Services/InventoryService/InventoryService.cs
View File

@@ -232,7 +232,7 @@ namespace OpenSim.Services.InventoryService
m_log.WarnFormat("[INVENTORY SERVICE]: User {0} inventory not available", userID);
}
callback.BeginInvoke(folders, items, null, null);
Util.FireAndForget(delegate { callback(folders, items); });
}
public InventoryCollection GetFolderContent(UUID userID, UUID folderID)