aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Capabilities')
-rw-r--r--OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
index 5c7a3df..7197049 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
@@ -128,7 +128,9 @@ namespace OpenSim.Capabilities.Handlers
128 if (invcollSet == null) 128 if (invcollSet == null)
129 { 129 {
130 m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Multiple folder fetch failed. Trying old protocol."); 130 m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Multiple folder fetch failed. Trying old protocol.");
131#pragma warning disable 0612
131 return FetchInventoryDescendentsRequest(foldersrequested, httpRequest, httpResponse); 132 return FetchInventoryDescendentsRequest(foldersrequested, httpRequest, httpResponse);
133#pragma warning restore 0612
132 } 134 }
133 135
134 string inventoryitemstr = string.Empty; 136 string inventoryitemstr = string.Empty;
@@ -199,10 +201,11 @@ namespace OpenSim.Capabilities.Handlers
199 int version = 0; 201 int version = 0;
200 int descendents = 0; 202 int descendents = 0;
201 203
202 inv 204#pragma warning disable 0612
203 = Fetch( 205 inv = Fetch(
204 invFetch.owner_id, invFetch.folder_id, invFetch.owner_id, 206 invFetch.owner_id, invFetch.folder_id, invFetch.owner_id,
205 invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version, out descendents); 207 invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version, out descendents);
208#pragma warning restore 0612
206 209
207 if (inv != null && inv.Folders != null) 210 if (inv != null && inv.Folders != null)
208 { 211 {