From a6999f8a5d011d7540c04fa5434864fab53b2ef8 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Sat, 29 Mar 2008 23:07:48 +0000 Subject: * Refactor: Remove unused inventory methods, some of which weren't properly implemented anyway. --- .../Communications/Local/LocalInventoryService.cs | 19 ------------------- .../Region/Communications/Local/LocalLoginService.cs | 2 +- 2 files changed, 1 insertion(+), 20 deletions(-) (limited to 'OpenSim/Region/Communications/Local') diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs index fc5cc6c..df735a9 100644 --- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs +++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs @@ -42,7 +42,6 @@ namespace OpenSim.Region.Communications.Local public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack) { - //List folders = RequestFirstLevelFolders(userID); List folders = GetInventorySkeleton(userID); InventoryFolderImpl rootFolder = null; @@ -101,24 +100,6 @@ namespace OpenSim.Region.Communications.Local } } - public override InventoryFolderBase RequestNamedFolder(LLUUID userID, string folderName) - { - List folders = RequestFirstLevelFolders(userID); - InventoryFolderBase requestedFolder = null; - - //need to make sure we send root folder first - foreach (InventoryFolderBase folder in folders) - { - if (folder.name == folderName) - { - requestedFolder = folder; - break; - } - } - - return requestedFolder; - } - /// /// Send the given inventory folder and its item contents back to the requester. /// diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs index 6bb505d..3cea82d 100644 --- a/OpenSim/Region/Communications/Local/LocalLoginService.cs +++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs @@ -216,7 +216,7 @@ namespace OpenSim.Region.Communications.Local protected override InventoryData GetInventorySkeleton(LLUUID userID) { List folders = m_Parent.InventoryService.GetInventorySkeleton(userID); - //List folders = m_Parent.InventoryService.RequestFirstLevelFolders(userID); + if (folders.Count > 0) { LLUUID rootID = LLUUID.Zero; -- cgit v1.1