aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-06-11 21:52:43 +0100
committerJustin Clark-Casey (justincc)2010-06-11 21:55:18 +0100
commit3525195bc9b5fdfd9799411edd452981ef1f4ebd (patch)
treeb1749b64b68def578c061496a9be8d3641e215a0 /OpenSim/Tests
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-3525195bc9b5fdfd9799411edd452981ef1f4ebd.zip
opensim-SC_OLD-3525195bc9b5fdfd9799411edd452981ef1f4ebd.tar.gz
opensim-SC_OLD-3525195bc9b5fdfd9799411edd452981ef1f4ebd.tar.bz2
opensim-SC_OLD-3525195bc9b5fdfd9799411edd452981ef1f4ebd.tar.xz
Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)
This involves no wire changes since the methods often just construct an InventoryFolderBase under the hood. This is in line with other methods that alraedy allow requests via uuid
Diffstat (limited to '')
-rw-r--r--OpenSim/Tests/Common/Mock/MockInventoryService.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Mock/MockInventoryService.cs b/OpenSim/Tests/Common/Mock/MockInventoryService.cs
index 1ea4bc1..fc27487 100644
--- a/OpenSim/Tests/Common/Mock/MockInventoryService.cs
+++ b/OpenSim/Tests/Common/Mock/MockInventoryService.cs
@@ -162,6 +162,11 @@ namespace OpenSim.Tests.Common.Mock
162 { 162 {
163 return null; 163 return null;
164 } 164 }
165
166 public InventoryFolderBase GetFolder(UUID folderId, UUID userId)
167 {
168 return null;
169 }
165 170
166 public InventoryFolderBase GetFolder(InventoryFolderBase folder) 171 public InventoryFolderBase GetFolder(InventoryFolderBase folder)
167 { 172 {