Merge branch 'master' into presence-refactor

This commit is contained in:
Melanie
2010-01-04 21:41:33 +00:00
62 changed files with 1839 additions and 823 deletions

View File

@@ -59,6 +59,7 @@ namespace OpenSim.Services.Interfaces
/// </summary>
/// <param name="userID"></param>
/// <returns></returns>
[Obsolete]
InventoryCollection GetUserInventory(UUID userID);
/// <summary>
@@ -67,6 +68,7 @@ namespace OpenSim.Services.Interfaces
/// </summary>
/// <param name="userID"></param>
/// <param name="callback"></param>
[Obsolete]
void GetUserInventory(UUID userID, InventoryReceiptCallback callback);
/// <summary>