Merge branch 'master' of git://opensimulator.org/git/opensim

1 files changed, 31 insertions, 14 deletions

diff --git a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
index 442ff06..1b14abb 100644
--- a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
@@ -39,12 +39,17 @@ namespace OpenSim.Tests.Common.Mock
     /// tests are single threaded.
     /// </summary>
     public class TestInventoryDataPlugin : IInventoryDataPlugin
-    {
+    {           
         /// <value>
-        /// Known inventory folders
+        /// Inventory folders
         /// </value>
         private Dictionary<UUID, InventoryFolderBase> m_folders = new Dictionary<UUID, InventoryFolderBase>();
 
+        //// <value>
+        /// Inventory items
+        /// </value>
+        private Dictionary<UUID, InventoryItemBase> m_items = new Dictionary<UUID, InventoryItemBase>();        
+
         /// <value>
         /// User root folders
         /// </value>
@@ -99,9 +104,7 @@ namespace OpenSim.Tests.Common.Mock
             }
 
             return folders;
-        }
-
-        public InventoryItemBase getInventoryItem(UUID item) { return null; }
+        }        
 
         public InventoryFolderBase getInventoryFolder(UUID folderId)
         {
@@ -111,15 +114,6 @@ namespace OpenSim.Tests.Common.Mock
             return folder;
         }
 
-        public void addInventoryItem(InventoryItemBase item) {}
-        public void updateInventoryItem(InventoryItemBase item) {}
-        public void deleteInventoryItem(UUID item) {}
-
-        public InventoryItemBase queryInventoryItem(UUID item)
-        {
-            return null;
-        }
-
         public InventoryFolderBase queryInventoryFolder(UUID folderID)
         {
             return getInventoryFolder(folderID);
@@ -150,6 +144,29 @@ namespace OpenSim.Tests.Common.Mock
                 m_folders.Remove(folderId);
         }
 
+        public void addInventoryItem(InventoryItemBase item) { m_items[item.ID] = item; }
+        
+        public void updateInventoryItem(InventoryItemBase item) { addInventoryItem(item); }
+        
+        public void deleteInventoryItem(UUID itemId) 
+        {
+            if (m_items.ContainsKey(itemId))
+                m_items.Remove(itemId);
+        }
+        
+        public InventoryItemBase getInventoryItem(UUID itemId) 
+        {
+            if (m_items.ContainsKey(itemId))
+                return m_items[itemId];
+            else
+                return null; 
+        }
+
+        public InventoryItemBase queryInventoryItem(UUID item)
+        {
+            return null;
+        }        
+
         public List<InventoryItemBase> fetchActiveGestures(UUID avatarID) { return null; }
     }
 }