* Refactor: Remove unused inventory methods, some of which weren't properly implemented anyway.

3 files changed, 1 insertions, 30 deletions

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<InventoryFolderBase> folders = RequestFirstLevelFolders(userID);
             List<InventoryFolderBase> folders = GetInventorySkeleton(userID);
             
             InventoryFolderImpl rootFolder = null;
@@ -101,24 +100,6 @@ namespace OpenSim.Region.Communications.Local
             }
         }
 
-        public override InventoryFolderBase RequestNamedFolder(LLUUID userID, string folderName)
-        {
-             List<InventoryFolderBase> 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;
-        }
-
         /// <summary>
         /// Send the given inventory folder and its item contents back to the requester.
         /// </summary>
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<InventoryFolderBase> folders = m_Parent.InventoryService.GetInventorySkeleton(userID);
-            //List<InventoryFolderBase> folders = m_Parent.InventoryService.RequestFirstLevelFolders(userID);
+
             if (folders.Count > 0)
             {
                 LLUUID rootID = LLUUID.Zero;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index e78fc1a..5c93962 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -208,11 +208,6 @@ namespace OpenSim.Region.Communications.OGS1
             return null;
         }
 
-        public virtual InventoryFolderBase RequestNamedFolder(LLUUID userID, string folderName)
-        {
-            return null;
-        }
-
         public void CreateNewUserInventory(LLUUID user)
         {
         }
@@ -225,11 +220,6 @@ namespace OpenSim.Region.Communications.OGS1
             return new List<InventoryFolderBase>();
         }
 
-        public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID)
-        {
-            return new List<InventoryFolderBase>();
-        }
-
         #endregion
 
         public class InventoryRequest