summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodelbackgroundfetch.cpp
diff options
context:
space:
mode:
authorCallum Prentice <callum@gmail.com>2017-04-21 14:32:13 -0700
committerCallum Prentice <callum@gmail.com>2017-04-21 14:32:13 -0700
commit2a5c47eb083a55cccb60916263b3c2b5d8d9c4fe (patch)
treeec40f2091563c690e06fb16d54b84d0e65bef39a /indra/newview/llinventorymodelbackgroundfetch.cpp
parent8846f9c7c19f85118da7d5601ad1dd14e491b6f5 (diff)
parent5f6bcaf456469f07d23a5599a1fed59420fd6ae7 (diff)
Automated merge with tip of viewer64 (after it was merged with viewer-release)
Diffstat (limited to 'indra/newview/llinventorymodelbackgroundfetch.cpp')
-rw-r--r--indra/newview/llinventorymodelbackgroundfetch.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 4a77edc565..a8919db828 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -360,9 +360,12 @@ void LLInventoryModelBackgroundFetch::incrFetchCount(S32 fetching)
}
}
+static LLTrace::BlockTimerStatHandle FTM_BULK_FETCH("Bulk Fetch");
+
// Bundle up a bunch of requests to send all at once.
void LLInventoryModelBackgroundFetch::bulkFetch()
{
+ LL_RECORD_BLOCK_TIME(FTM_BULK_FETCH);
//Background fetch is called from gIdleCallbacks in a loop until background fetch is stopped.
//If there are items in mFetchQueue, we want to check the time since the last bulkFetch was
//sent. If it exceeds our retry time, go ahead and fire off another batch.