diff options
author | Justin Clark-Casey (justincc) | 2011-06-04 02:39:26 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-06-04 02:39:26 +0100 |
commit | 12b1cbf8bfc559e4da40abf518e8e99fac793870 (patch) | |
tree | ba588348ce68360372cf73a07fd3eb5057234b75 /OpenSim/Services/InventoryService/InventoryService.cs | |
parent | insert an InventoryArchiveUtils.FindItemsByPath() to return multiple items ra... (diff) | |
download | opensim-SC_OLD-12b1cbf8bfc559e4da40abf518e8e99fac793870.zip opensim-SC_OLD-12b1cbf8bfc559e4da40abf518e8e99fac793870.tar.gz opensim-SC_OLD-12b1cbf8bfc559e4da40abf518e8e99fac793870.tar.bz2 opensim-SC_OLD-12b1cbf8bfc559e4da40abf518e8e99fac793870.tar.xz |
Fix give inventory tests to use different users rather than (accidentally) the same user. Extend TestGiveInventoryItem() to test giving back the same item.
Diffstat (limited to 'OpenSim/Services/InventoryService/InventoryService.cs')
-rw-r--r-- | OpenSim/Services/InventoryService/InventoryService.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs index e543337..73dd06a 100644 --- a/OpenSim/Services/InventoryService/InventoryService.cs +++ b/OpenSim/Services/InventoryService/InventoryService.cs | |||
@@ -340,6 +340,9 @@ namespace OpenSim.Services.InventoryService | |||
340 | List<InventoryItemBase> itemsList = new List<InventoryItemBase>(); | 340 | List<InventoryItemBase> itemsList = new List<InventoryItemBase>(); |
341 | 341 | ||
342 | itemsList.AddRange(m_Database.getInventoryInFolder(folderID)); | 342 | itemsList.AddRange(m_Database.getInventoryInFolder(folderID)); |
343 | |||
344 | // m_log.DebugFormat( | ||
345 | // "[INVENTORY SERVICE]: Found {0} items in folder {1} for {2}", itemsList.Count, folderID, userID); | ||
343 | 346 | ||
344 | return itemsList; | 347 | return itemsList; |
345 | } | 348 | } |
@@ -385,8 +388,9 @@ namespace OpenSim.Services.InventoryService | |||
385 | // See IInventoryServices | 388 | // See IInventoryServices |
386 | public virtual bool AddItem(InventoryItemBase item) | 389 | public virtual bool AddItem(InventoryItemBase item) |
387 | { | 390 | { |
388 | m_log.DebugFormat( | 391 | // m_log.DebugFormat( |
389 | "[INVENTORY SERVICE]: Adding item {0} {1} to folder {2}", item.Name, item.ID, item.Folder); | 392 | // "[INVENTORY SERVICE]: Adding item {0} {1} to folder {2} for {3}", |
393 | // item.Name, item.ID, item.Folder, item.Owner); | ||
390 | 394 | ||
391 | m_Database.addInventoryItem(item); | 395 | m_Database.addInventoryItem(item); |
392 | 396 | ||