From 3c13f5c3aae3d70f1e8dd3ccdee70baaeb79f0f8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 22 Mar 2012 22:17:07 +0000
Subject: Add llGiveInventory() test from object to object where both objects
are owned by the same user.
---
OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | 11 ++++++++++-
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 6 +++---
OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs | 6 ++++--
3 files changed, 17 insertions(+), 6 deletions(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index 15060fd..1334905 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -155,6 +155,15 @@ namespace OpenSim.Region.Framework.Interfaces
TaskInventoryItem GetInventoryItem(UUID itemId);
///
+ /// Get all inventory items.
+ ///
+ ///
+ ///
+ /// If there are no inventory items then an empty list is returned.
+ ///
+ List GetInventoryItems();
+
+ ///
/// Get inventory items by name.
///
///
@@ -162,7 +171,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// A list of inventory items with that name.
/// If no inventory item has that name then an empty list is returned.
///
- IList GetInventoryItems(string name);
+ List GetInventoryItems(string name);
///
/// Get the scene object referenced by an inventory item.
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index f2d1915..71a9084 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -590,9 +590,9 @@ namespace OpenSim.Region.Framework.Scenes
/// A list of inventory items with that name.
/// If no inventory item has that name then an empty list is returned.
///
- public IList GetInventoryItems(string name)
+ public List GetInventoryItems(string name)
{
- IList items = new List();
+ List items = new List();
lock (m_items)
{
@@ -1100,7 +1100,7 @@ namespace OpenSim.Region.Framework.Scenes
public List GetInventoryItems()
{
- List ret = new List();
+ List ret = new List();
lock (m_items)
ret = new List(m_items.Values);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
index e4b607d..f946b00 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Region.Framework.Tests
}
///
- /// Test MoveTaskInventoryItem where the item has no parent folder assigned.
+ /// Test MoveTaskInventoryItem from a part inventory to a user inventory where the item has no parent folder assigned.
///
///
/// This should place it in the most suitable user folder.
@@ -143,9 +143,11 @@ namespace OpenSim.Region.Framework.Tests
}
///
- /// Test MoveTaskInventoryItem where the item has no parent folder assigned.
+ /// Test MoveTaskInventoryItem from a part inventory to a user inventory where the item has no parent folder assigned.
///
+ ///
/// This should place it in the most suitable user folder.
+ ///
[Test]
public void TestMoveTaskInventoryItemNoParent()
{
--
cgit v1.1