From 3430a31e9d7b78ecc968e04feb7394adf70d0934 Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Mon, 11 Nov 2013 11:50:07 +0100 Subject: [PATCH] Fixed fetching inventory when UseHTTPInventory is disabled --- indra/newview/llviewerinventory.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index de52941d1..7194711a6 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -655,13 +655,16 @@ bool LLViewerInventoryCategory::fetch() { llwarns << "agent region is null" << llendl; } - if (!url.empty()) //Capability found. Build up LLSD and use it. + if (!url.empty() && gSavedSettings.getBOOL("UseHTTPInventory")) //Capability found and HTTP inventory enabled. Build up LLSD and use it. { LLInventoryModelBackgroundFetch::instance().start(mUUID, false); } else - { //Deprecated, but if we don't have a capability, use the old system. - llinfos << "FetchInventoryDescendents2 capability not found. Using deprecated UDP message." << llendl; + { //We don't have a capability or the use of HTTP inventory is disabled, use the old system. + if (gSavedSettings.getBOOL("UseHTTPInventory")) + { + llinfos << "FetchInventoryDescendents2 capability not found. Using UDP message." << llendl; + } LLMessageSystem* msg = gMessageSystem; msg->newMessage("FetchInventoryDescendents"); msg->nextBlock("AgentData");