summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-09-26 19:12:40 -0700
committerRichard Linden <none@none>2012-09-26 19:12:40 -0700
commit07c4be092b276f0d7c14ba12872efb31c1f16764 (patch)
tree06c7d37425301130295fe62a2f4db2ea7c2b562c /indra/newview
parent05a3203d8274a0a0999faad128f629614b8d62c5 (diff)
SH-3275 WIP Run viewer metrics for object update messages
slave threads now pushing data to master thread
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llappviewer.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index c3ac615169..fcbef491fe 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1222,6 +1222,7 @@ bool LLAppViewer::mainLoop()
{
LLFastTimer _(FTM_FRAME);
LLFastTimer::nextFrame();
+ LLTrace::getMasterThreadTrace().pullFromSlaveThreads();
//clear call stack records
llclearcallstacks;