diff options
| author | Mic Bowman | 2011-04-12 12:38:47 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-12 12:38:47 -0700 |
| commit | 0e97629ee7b24ede98983ad5cebc590fc0b7b74f (patch) | |
| tree | 51f38b9ad75a09ce70ef00df9717444aa1e670f7 /OpenSim/Services | |
| parent | New tokenbucket algorithm. This one provides fair sharing of the queues (diff) | |
| parent | minor: add a bit more method doc to IInventoryService.GetItem() (diff) | |
| download | opensim-SC_OLD-0e97629ee7b24ede98983ad5cebc590fc0b7b74f.zip opensim-SC_OLD-0e97629ee7b24ede98983ad5cebc590fc0b7b74f.tar.gz opensim-SC_OLD-0e97629ee7b24ede98983ad5cebc590fc0b7b74f.tar.bz2 opensim-SC_OLD-0e97629ee7b24ede98983ad5cebc590fc0b7b74f.tar.xz | |
Merge branch 'master' into queuetest
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/Interfaces/IInventoryService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs index d19faed..a8bfe47 100644 --- a/OpenSim/Services/Interfaces/IInventoryService.cs +++ b/OpenSim/Services/Interfaces/IInventoryService.cs | |||
| @@ -169,7 +169,7 @@ namespace OpenSim.Services.Interfaces | |||
| 169 | /// Get an item, given by its UUID | 169 | /// Get an item, given by its UUID |
| 170 | /// </summary> | 170 | /// </summary> |
| 171 | /// <param name="item"></param> | 171 | /// <param name="item"></param> |
| 172 | /// <returns></returns> | 172 | /// <returns>null if no item was found, otherwise the found item</returns> |
| 173 | InventoryItemBase GetItem(InventoryItemBase item); | 173 | InventoryItemBase GetItem(InventoryItemBase item); |
| 174 | 174 | ||
| 175 | /// <summary> | 175 | /// <summary> |