diff options
| author | Melanie | 2010-01-04 06:17:38 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-04 06:17:38 +0000 |
| commit | d657b76dba39a9cb5e37f7f86056893e39e8a3f9 (patch) | |
| tree | e76f5c9177496038984afa7c4eb04fb093d475fc /OpenSim/Services/Interfaces/IInventoryService.cs | |
| parent | Solve conflict (diff) | |
| parent | When rezzing a no-copy object on a no-rez parcel, the object vanishes from (diff) | |
| download | opensim-SC_OLD-d657b76dba39a9cb5e37f7f86056893e39e8a3f9.zip opensim-SC_OLD-d657b76dba39a9cb5e37f7f86056893e39e8a3f9.tar.gz opensim-SC_OLD-d657b76dba39a9cb5e37f7f86056893e39e8a3f9.tar.bz2 opensim-SC_OLD-d657b76dba39a9cb5e37f7f86056893e39e8a3f9.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Services/Interfaces/IInventoryService.cs')
| -rw-r--r-- | OpenSim/Services/Interfaces/IInventoryService.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs index c775090..1b78fb3 100644 --- a/OpenSim/Services/Interfaces/IInventoryService.cs +++ b/OpenSim/Services/Interfaces/IInventoryService.cs | |||
| @@ -59,6 +59,7 @@ namespace OpenSim.Services.Interfaces | |||
| 59 | /// </summary> | 59 | /// </summary> |
| 60 | /// <param name="userID"></param> | 60 | /// <param name="userID"></param> |
| 61 | /// <returns></returns> | 61 | /// <returns></returns> |
| 62 | [Obsolete] | ||
| 62 | InventoryCollection GetUserInventory(UUID userID); | 63 | InventoryCollection GetUserInventory(UUID userID); |
| 63 | 64 | ||
| 64 | /// <summary> | 65 | /// <summary> |
| @@ -67,6 +68,7 @@ namespace OpenSim.Services.Interfaces | |||
| 67 | /// </summary> | 68 | /// </summary> |
| 68 | /// <param name="userID"></param> | 69 | /// <param name="userID"></param> |
| 69 | /// <param name="callback"></param> | 70 | /// <param name="callback"></param> |
| 71 | [Obsolete] | ||
| 70 | void GetUserInventory(UUID userID, InventoryReceiptCallback callback); | 72 | void GetUserInventory(UUID userID, InventoryReceiptCallback callback); |
| 71 | 73 | ||
| 72 | /// <summary> | 74 | /// <summary> |