*remove conflicts

1 files changed, 7 insertions, 2 deletions

diff --git a/OpenSim/Tests/Common/Mock/TestInventoryService.cs b/OpenSim/Tests/Common/Mock/TestInventoryService.cs
index 6635700..ba9cbe9 100644
--- a/OpenSim/Tests/Common/Mock/TestInventoryService.cs
+++ b/OpenSim/Tests/Common/Mock/TestInventoryService.cs
@@ -148,12 +148,12 @@ namespace OpenSim.Tests.Common.Mock
             return false;
         }
 
-        public InventoryItemBase QueryItem(InventoryItemBase item)
+        public InventoryItemBase GetItem(InventoryItemBase item)
         {
             return null;
         }
 
-        public InventoryFolderBase QueryFolder(InventoryFolderBase folder)
+        public InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
             return null;
         }
@@ -171,5 +171,10 @@ namespace OpenSim.Tests.Common.Mock
             root.ParentID = UUID.Zero;
             return root;
         }
+
+        public int GetAssetPermissions(UUID userID, UUID assetID)
+        {
+            return 1;
+        }
     }
 }