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

UseHTTPInventory can never be turned off on SL anymore.

Browse Source
This commit is contained in:
Inusaito Sayori
2015-04-07 18:37:34 -04:00
parent f514243c1b
commit 036d5b84d1
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llinventorymodelbackgroundfetch.cpp
View File

@@ -193,12 +193,17 @@ void LLInventoryModelBackgroundFetch::backgroundFetchCB(void *)
LLInventoryModelBackgroundFetch::instance().backgroundFetch();
}
bool use_http_inventory()
{
return gHippoGridManager->getConnectedGrid()->isSecondLife() || gSavedSettings.getBOOL("UseHTTPInventory");
}
void LLInventoryModelBackgroundFetch::backgroundFetch()
{
LLViewerRegion* region = gAgent.getRegion();
if (mBackgroundFetchActive && region && region->capabilitiesReceived())
{
if (gSavedSettings.getBOOL("UseHTTPInventory"))
if (use_http_inventory())
{
// If we'll be using the capability, we'll be sending batches and the background thing isn't as important.
std::string url = region->getCapability("FetchInventory2");