diff options
author | Justin Clarke Casey | 2008-03-29 23:07:48 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-03-29 23:07:48 +0000 |
commit | a6999f8a5d011d7540c04fa5434864fab53b2ef8 (patch) | |
tree | 53692c377933279899cf39812bca0725b25c0a04 | |
parent | * Tidy up 'show users' display (diff) | |
download | opensim-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 '')
6 files changed, 16 insertions, 73 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); |
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs index cfe06e8..a003cd3 100644 --- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs +++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs | |||
@@ -136,6 +136,17 @@ namespace OpenSim.Grid.InventoryServer | |||
136 | 136 | ||
137 | return invCollection; | 137 | return invCollection; |
138 | } | 138 | } |
139 | |||
140 | /// <summary> | ||
141 | /// Guid to UUID wrapper for same name IInventoryServices method | ||
142 | /// </summary> | ||
143 | /// <param name="rawUserID"></param> | ||
144 | /// <returns></returns> | ||
145 | public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID) | ||
146 | { | ||
147 | LLUUID userID = new LLUUID(rawUserID); | ||
148 | return GetInventorySkeleton(userID); | ||
149 | } | ||
139 | 150 | ||
140 | public bool CreateUsersInventory(Guid rawUserID) | 151 | public bool CreateUsersInventory(Guid rawUserID) |
141 | { | 152 | { |
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 | |||
42 | public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, | 42 | public override void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, |
43 | InventoryItemInfo itemCallBack) | 43 | InventoryItemInfo itemCallBack) |
44 | { | 44 | { |
45 | //List<InventoryFolderBase> folders = RequestFirstLevelFolders(userID); | ||
46 | List<InventoryFolderBase> folders = GetInventorySkeleton(userID); | 45 | List<InventoryFolderBase> folders = GetInventorySkeleton(userID); |
47 | 46 | ||
48 | InventoryFolderImpl rootFolder = null; | 47 | InventoryFolderImpl rootFolder = null; |
@@ -101,24 +100,6 @@ namespace OpenSim.Region.Communications.Local | |||
101 | } | 100 | } |
102 | } | 101 | } |
103 | 102 | ||
104 | public override InventoryFolderBase RequestNamedFolder(LLUUID userID, string folderName) | ||
105 | { | ||
106 | List<InventoryFolderBase> folders = RequestFirstLevelFolders(userID); | ||
107 | InventoryFolderBase requestedFolder = null; | ||
108 | |||
109 | //need to make sure we send root folder first | ||
110 | foreach (InventoryFolderBase folder in folders) | ||
111 | { | ||
112 | if (folder.name == folderName) | ||
113 | { | ||
114 | requestedFolder = folder; | ||
115 | break; | ||
116 | } | ||
117 | } | ||
118 | |||
119 | return requestedFolder; | ||
120 | } | ||
121 | |||
122 | /// <summary> | 103 | /// <summary> |
123 | /// Send the given inventory folder and its item contents back to the requester. | 104 | /// Send the given inventory folder and its item contents back to the requester. |
124 | /// </summary> | 105 | /// </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 | |||
216 | protected override InventoryData GetInventorySkeleton(LLUUID userID) | 216 | protected override InventoryData GetInventorySkeleton(LLUUID userID) |
217 | { | 217 | { |
218 | List<InventoryFolderBase> folders = m_Parent.InventoryService.GetInventorySkeleton(userID); | 218 | List<InventoryFolderBase> folders = m_Parent.InventoryService.GetInventorySkeleton(userID); |
219 | //List<InventoryFolderBase> folders = m_Parent.InventoryService.RequestFirstLevelFolders(userID); | 219 | |
220 | if (folders.Count > 0) | 220 | if (folders.Count > 0) |
221 | { | 221 | { |
222 | LLUUID rootID = LLUUID.Zero; | 222 | 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 | |||
208 | return null; | 208 | return null; |
209 | } | 209 | } |
210 | 210 | ||
211 | public virtual InventoryFolderBase RequestNamedFolder(LLUUID userID, string folderName) | ||
212 | { | ||
213 | return null; | ||
214 | } | ||
215 | |||
216 | public void CreateNewUserInventory(LLUUID user) | 211 | public void CreateNewUserInventory(LLUUID user) |
217 | { | 212 | { |
218 | } | 213 | } |
@@ -225,11 +220,6 @@ namespace OpenSim.Region.Communications.OGS1 | |||
225 | return new List<InventoryFolderBase>(); | 220 | return new List<InventoryFolderBase>(); |
226 | } | 221 | } |
227 | 222 | ||
228 | public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID) | ||
229 | { | ||
230 | return new List<InventoryFolderBase>(); | ||
231 | } | ||
232 | |||
233 | #endregion | 223 | #endregion |
234 | 224 | ||
235 | public class InventoryRequest | 225 | public class InventoryRequest |