diff options
Diffstat (limited to 'OpenSim/Grid/InventoryServer/GridInventoryService.cs')
-rw-r--r-- | OpenSim/Grid/InventoryServer/GridInventoryService.cs | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs index 6f7672e..78d9f65 100644 --- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs +++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs | |||
@@ -192,15 +192,15 @@ namespace OpenSim.Grid.InventoryServer | |||
192 | invCollection.Folders = allFolders; | 192 | invCollection.Folders = allFolders; |
193 | invCollection.Items = allItems; | 193 | invCollection.Items = allItems; |
194 | 194 | ||
195 | // foreach (InventoryFolderBase folder in invCollection.Folders) | 195 | // foreach (InventoryFolderBase folder in invCollection.Folders) |
196 | // { | 196 | // { |
197 | // m_log.DebugFormat("[GRID AGENT INVENTORY]: Sending back folder {0} {1}", folder.Name, folder.ID); | 197 | // m_log.DebugFormat("[GRID AGENT INVENTORY]: Sending back folder {0} {1}", folder.Name, folder.ID); |
198 | // } | 198 | // } |
199 | // | 199 | // |
200 | // foreach (InventoryItemBase item in invCollection.Items) | 200 | // foreach (InventoryItemBase item in invCollection.Items) |
201 | // { | 201 | // { |
202 | // m_log.DebugFormat("[GRID AGENT INVENTORY]: Sending back item {0} {1}, folder {2}", item.Name, item.ID, item.Folder); | 202 | // m_log.DebugFormat("[GRID AGENT INVENTORY]: Sending back item {0} {1}, folder {2}", item.Name, item.ID, item.Folder); |
203 | // } | 203 | // } |
204 | 204 | ||
205 | m_log.InfoFormat( | 205 | m_log.InfoFormat( |
206 | "[GRID AGENT INVENTORY]: Sending back inventory response to user {0} containing {1} folders and {2} items", | 206 | "[GRID AGENT INVENTORY]: Sending back inventory response to user {0} containing {1} folders and {2} items", |
@@ -209,6 +209,22 @@ namespace OpenSim.Grid.InventoryServer | |||
209 | return invCollection; | 209 | return invCollection; |
210 | } | 210 | } |
211 | 211 | ||
212 | public List<InventoryItemBase> GetFolderItems(Guid folderID) | ||
213 | { | ||
214 | List<InventoryItemBase> allItems = new List<InventoryItemBase>(); | ||
215 | |||
216 | |||
217 | List<InventoryItemBase> items = RequestFolderItems(new UUID(folderID)); | ||
218 | |||
219 | if (items != null) | ||
220 | { | ||
221 | allItems.InsertRange(0, items); | ||
222 | } | ||
223 | m_log.InfoFormat( | ||
224 | "[GRID AGENT INVENTORY]: Sending back inventory response containing {0} items", allItems.Count.ToString()); | ||
225 | return allItems; | ||
226 | } | ||
227 | |||
212 | /// <summary> | 228 | /// <summary> |
213 | /// Guid to UUID wrapper for same name IInventoryServices method | 229 | /// Guid to UUID wrapper for same name IInventoryServices method |
214 | /// </summary> | 230 | /// </summary> |
@@ -233,7 +249,7 @@ namespace OpenSim.Grid.InventoryServer | |||
233 | 249 | ||
234 | return CreateNewUserInventory(userID); | 250 | return CreateNewUserInventory(userID); |
235 | } | 251 | } |
236 | 252 | ||
237 | public List<InventoryItemBase> GetActiveGestures(Guid rawUserID) | 253 | public List<InventoryItemBase> GetActiveGestures(Guid rawUserID) |
238 | { | 254 | { |
239 | UUID userID = new UUID(rawUserID); | 255 | UUID userID = new UUID(rawUserID); |