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.

---
 .../Framework/Communications/IInventoryServices.cs | 16 -----------
 .../Communications/InventoryServiceBase.cs         | 31 +++-------------------
 2 files changed, 4 insertions(+), 43 deletions(-)

(limited to 'OpenSim/Framework/Communications')

diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index d824e9d..eaa2350 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -79,14 +79,6 @@ namespace OpenSim.Framework.Communications
         /// <param name="userID"></param>
         /// <returns>null if no root folder was found</returns>
         InventoryFolderBase RequestRootFolder(LLUUID userID);
-
-        /// <summary>
-        /// Returns the root folder plus any folders in root (so down one level in the Inventory folders tree)
-        /// for the given user.
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <returns></returns>
-        List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID);
         
         /// <summary>
         /// Returns a list of all the folders in a given user's inventory.
@@ -95,13 +87,5 @@ namespace OpenSim.Framework.Communications
         /// <returns>A flat list of the user's inventory folder tree.  
         /// Null if there is no inventory for this user</returns>
         List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId);
-
-        /// <summary>
-        /// Returns the named folder in that users inventory, returns null if folder is not found.
-        /// </summary>
-        /// <param name="userID"></param>
-        /// <param name="folderName"></param>
-        /// <returns></returns>
-        InventoryFolderBase RequestNamedFolder(LLUUID userID, string folderName);
     }
 }
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 5515c77..719e0d6 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -74,31 +74,14 @@ namespace OpenSim.Framework.Communications
         
         #endregion
         
-        #region IInventoryServices methods
+        #region IInventoryServices methods        
 
         /// <summary>
-        /// Guid to UUID wrapper for same name IInventoryServices method
+        /// Returns the root folder plus any folders in root (so down one level in the Inventory folders tree)
+        /// for the given user.
         /// </summary>
-        /// <param name="rawUserID"></param>
+        /// <param name="userID"></param>
         /// <returns></returns>
-        public List<InventoryFolderBase> RequestFirstLevelFolders(Guid rawUserID)
-        {
-            LLUUID userID = new LLUUID(rawUserID);
-            return RequestFirstLevelFolders(userID);
-        }
-        
-        /// <summary>
-        /// Guid to UUID wrapper for same name IInventoryServices method
-        /// </summary>
-        /// <param name="rawUserID"></param>
-        /// <returns></returns>        
-        public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID)
-        {
-            LLUUID userID = new LLUUID(rawUserID);
-            return GetInventorySkeleton(userID);
-        }        
-
-        // See IInventoryServices
         public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID)
         {
             List<InventoryFolderBase> inventoryList = new List<InventoryFolderBase>();
@@ -176,12 +159,6 @@ namespace OpenSim.Framework.Communications
         }
 
         // See IInventoryServices
-        public virtual InventoryFolderBase RequestNamedFolder(LLUUID userID, string folderName)
-        {
-            return null;
-        }
-
-        // See IInventoryServices
         public void CreateNewUserInventory(LLUUID user)
         {
             InventoryFolderBase existingRootFolder = RequestRootFolder(user);
-- 
cgit v1.1