Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed fetching inventory when UseHTTPInventory is disabled

Browse Source
This commit is contained in:
Latif Khalifa
2013-11-11 11:50:07 +01:00
parent 7879509727
commit 3430a31e9d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llviewerinventory.cpp
View File

@@ -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");