aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-06-11 22:11:33 +0100
committerJustin Clark-Casey (justincc)2010-06-11 22:13:36 +0100
commit0dce4f1997c57cbdf6bc1f322182c318d3838e40 (patch)
treed3b564300cefb0de632fa0eadfaed57772c2832e /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver
parentAllow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(Inve... (diff)
downloadopensim-SC_OLD-0dce4f1997c57cbdf6bc1f322182c318d3838e40.zip
opensim-SC_OLD-0dce4f1997c57cbdf6bc1f322182c318d3838e40.tar.gz
opensim-SC_OLD-0dce4f1997c57cbdf6bc1f322182c318d3838e40.tar.bz2
opensim-SC_OLD-0dce4f1997c57cbdf6bc1f322182c318d3838e40.tar.xz
Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)"
This reverts commit 3525195bc9b5fdfd9799411edd452981ef1f4ebd.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index d003d2d..00bd27a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -575,9 +575,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
575 itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 575 itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID),
576 new Dictionary<string, InventoryFolderBase>(), new List<InventoryNodeBase>()); 576 new Dictionary<string, InventoryFolderBase>(), new List<InventoryNodeBase>());
577 577
578 InventoryFolderBase folder1Post = scene.InventoryService.GetFolder(folder1.ID, ua1.PrincipalID); 578 InventoryFolderBase folder1Post
579 = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, ua1.PrincipalID, folder1ExistingName);
579 Assert.That(folder1Post.ID, Is.EqualTo(folder1.ID)); 580 Assert.That(folder1Post.ID, Is.EqualTo(folder1.ID));
580
581 /* 581 /*
582 InventoryFolderBase folder2 582 InventoryFolderBase folder2
583 = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1Post, "b"); 583 = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1Post, "b");