diff options
author | Justin Clark-Casey (justincc) | 2010-06-11 21:52:43 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-06-11 21:55:18 +0100 |
commit | 3525195bc9b5fdfd9799411edd452981ef1f4ebd (patch) | |
tree | b1749b64b68def578c061496a9be8d3641e215a0 /OpenSim/Region/CoreModules/Avatar | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-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 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 4 |
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 00bd27a..d003d2d 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 | 578 | InventoryFolderBase folder1Post = scene.InventoryService.GetFolder(folder1.ID, ua1.PrincipalID); |
579 | = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, ua1.PrincipalID, folder1ExistingName); | ||
580 | Assert.That(folder1Post.ID, Is.EqualTo(folder1.ID)); | 579 | 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"); |