aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-29 23:07:48 +0000
committerJustin Clarke Casey2008-03-29 23:07:48 +0000
commita6999f8a5d011d7540c04fa5434864fab53b2ef8 (patch)
tree53692c377933279899cf39812bca0725b25c0a04 /OpenSim/Framework
parent* Tidy up 'show users' display (diff)
downloadopensim-SC-a6999f8a5d011d7540c04fa5434864fab53b2ef8.zip
opensim-SC-a6999f8a5d011d7540c04fa5434864fab53b2ef8.tar.gz
opensim-SC-a6999f8a5d011d7540c04fa5434864fab53b2ef8.tar.bz2
opensim-SC-a6999f8a5d011d7540c04fa5434864fab53b2ef8.tar.xz
* Refactor: Remove unused inventory methods, some of which weren't properly implemented anyway.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/IInventoryServices.cs16
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs31
2 files changed, 4 insertions, 43 deletions
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
79 /// <param name="userID"></param> 79 /// <param name="userID"></param>
80 /// <returns>null if no root folder was found</returns> 80 /// <returns>null if no root folder was found</returns>
81 InventoryFolderBase RequestRootFolder(LLUUID userID); 81 InventoryFolderBase RequestRootFolder(LLUUID userID);
82
83 /// <summary>
84 /// Returns the root folder plus any folders in root (so down one level in the Inventory folders tree)
85 /// for the given user.
86 /// </summary>
87 /// <param name="userID"></param>
88 /// <returns></returns>
89 List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID);
90 82
91 /// <summary> 83 /// <summary>
92 /// Returns a list of all the folders in a given user's inventory. 84 /// Returns a list of all the folders in a given user's inventory.
@@ -95,13 +87,5 @@ namespace OpenSim.Framework.Communications
95 /// <returns>A flat list of the user's inventory folder tree. 87 /// <returns>A flat list of the user's inventory folder tree.
96 /// Null if there is no inventory for this user</returns> 88 /// Null if there is no inventory for this user</returns>
97 List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId); 89 List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId);
98
99 /// <summary>
100 /// Returns the named folder in that users inventory, returns null if folder is not found.
101 /// </summary>
102 /// <param name="userID"></param>
103 /// <param name="folderName"></param>
104 /// <returns></returns>
105 InventoryFolderBase RequestNamedFolder(LLUUID userID, string folderName);
106 } 90 }
107} 91}
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
74 74
75 #endregion 75 #endregion
76 76
77 #region IInventoryServices methods 77 #region IInventoryServices methods
78 78
79 /// <summary> 79 /// <summary>
80 /// Guid to UUID wrapper for same name IInventoryServices method 80 /// Returns the root folder plus any folders in root (so down one level in the Inventory folders tree)
81 /// for the given user.
81 /// </summary> 82 /// </summary>
82 /// <param name="rawUserID"></param> 83 /// <param name="userID"></param>
83 /// <returns></returns> 84 /// <returns></returns>
84 public List<InventoryFolderBase> RequestFirstLevelFolders(Guid rawUserID)
85 {
86 LLUUID userID = new LLUUID(rawUserID);
87 return RequestFirstLevelFolders(userID);
88 }
89
90 /// <summary>
91 /// Guid to UUID wrapper for same name IInventoryServices method
92 /// </summary>
93 /// <param name="rawUserID"></param>
94 /// <returns></returns>
95 public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID)
96 {
97 LLUUID userID = new LLUUID(rawUserID);
98 return GetInventorySkeleton(userID);
99 }
100
101 // See IInventoryServices
102 public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID) 85 public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID)
103 { 86 {
104 List<InventoryFolderBase> inventoryList = new List<InventoryFolderBase>(); 87 List<InventoryFolderBase> inventoryList = new List<InventoryFolderBase>();
@@ -176,12 +159,6 @@ namespace OpenSim.Framework.Communications
176 } 159 }
177 160
178 // See IInventoryServices 161 // See IInventoryServices
179 public virtual InventoryFolderBase RequestNamedFolder(LLUUID userID, string folderName)
180 {
181 return null;
182 }
183
184 // See IInventoryServices
185 public void CreateNewUserInventory(LLUUID user) 162 public void CreateNewUserInventory(LLUUID user)
186 { 163 {
187 InventoryFolderBase existingRootFolder = RequestRootFolder(user); 164 InventoryFolderBase existingRootFolder = RequestRootFolder(user);