diff options
author | Justin Clark-Casey (justincc) | 2011-11-26 01:39:23 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-26 01:39:23 +0000 |
commit | bafea2282a95017099578a0a31a908e746161414 (patch) | |
tree | 21a459dcbccb81291dfd953f2c48bd853b4e5b1a /OpenSim/Capabilities/Handlers | |
parent | Use the same web fetch handler for every request from every avatar, since it ... (diff) | |
download | opensim-SC-bafea2282a95017099578a0a31a908e746161414.zip opensim-SC-bafea2282a95017099578a0a31a908e746161414.tar.gz opensim-SC-bafea2282a95017099578a0a31a908e746161414.tar.bz2 opensim-SC-bafea2282a95017099578a0a31a908e746161414.tar.xz |
Rip out unused Scene.HandleFetchInventoryDescendentsCAPS().
This has been handled by WebFetchInvDescHandler.Fetch() for some time.
Diffstat (limited to 'OpenSim/Capabilities/Handlers')
-rw-r--r-- | OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs index de7abe2..2dade5b 100644 --- a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs | |||
@@ -184,6 +184,17 @@ namespace OpenSim.Capabilities.Handlers | |||
184 | return reply; | 184 | return reply; |
185 | } | 185 | } |
186 | 186 | ||
187 | /// <summary> | ||
188 | /// Handle the caps inventory descendents fetch. | ||
189 | /// </summary> | ||
190 | /// <param name="agentID"></param> | ||
191 | /// <param name="folderID"></param> | ||
192 | /// <param name="ownerID"></param> | ||
193 | /// <param name="fetchFolders"></param> | ||
194 | /// <param name="fetchItems"></param> | ||
195 | /// <param name="sortOrder"></param> | ||
196 | /// <param name="version"></param> | ||
197 | /// <returns>An empty InventoryCollection if the inventory look up failed</returns> | ||
187 | public InventoryCollection Fetch( | 198 | public InventoryCollection Fetch( |
188 | UUID agentID, UUID folderID, UUID ownerID, | 199 | UUID agentID, UUID folderID, UUID ownerID, |
189 | bool fetchFolders, bool fetchItems, int sortOrder, out int version) | 200 | bool fetchFolders, bool fetchItems, int sortOrder, out int version) |
@@ -192,6 +203,8 @@ namespace OpenSim.Capabilities.Handlers | |||
192 | // "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}", | 203 | // "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}", |
193 | // fetchFolders, fetchItems, folderID, agentID); | 204 | // fetchFolders, fetchItems, folderID, agentID); |
194 | 205 | ||
206 | // FIXME MAYBE: We're not handling sortOrder! | ||
207 | |||
195 | version = 0; | 208 | version = 0; |
196 | InventoryFolderImpl fold; | 209 | InventoryFolderImpl fold; |
197 | if (m_LibraryService != null && m_LibraryService.LibraryRootFolder != null && agentID == m_LibraryService.LibraryRootFolder.Owner) | 210 | if (m_LibraryService != null && m_LibraryService.LibraryRootFolder != null && agentID == m_LibraryService.LibraryRootFolder.Owner) |