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

Merge remote-tracking branch 'shyotl/sunshine'

Browse Source
This commit is contained in:
Latif Khalifa
2013-01-21 11:25:10 +01:00
parent 4cd2de0fff dc106c5442
commit 18816ae146
415 changed files with 20229 additions and 16924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llinventorymodelbackgroundfetch.cpp
View File

@@ -185,16 +185,10 @@ void LLInventoryModelBackgroundFetch::backgroundFetchCB(void *)
LLInventoryModelBackgroundFetch::instance().backgroundFetch();
}
//static
void LLInventoryModelBackgroundFetch::backgroundFetch()
{
LLViewerRegion* region = gAgent.getRegion();
if (!region)
{
return;
}
if (mBackgroundFetchActive && gAgent.getRegion())
if (mBackgroundFetchActive && region && region->capabilitiesReceived())
{
// 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");