summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-10-02 15:37:16 -0700
committerRichard Linden <none@none>2012-10-02 15:37:16 -0700
commitdbe9742703cf14db85ec3d16c540efc68dce95a6 (patch)
treee15c2814f98a4cbdcd9d281ce4762f2fca5a86a5 /indra/newview/llappviewer.cpp
parent14b1b0b2bb6bac5bc688cc4d14c33f1b680dd3b4 (diff)
SH-3404 create sampler class
renamed LLTrace::ThreadTrace to LLTrace::ThreadRecorder renamed LLTrace::Sampler to LLTrace::Recording
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 0bb87dfa6c..22f3cce9e8 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1222,7 +1222,7 @@ bool LLAppViewer::mainLoop()
{
LLFastTimer _(FTM_FRAME);
LLFastTimer::nextFrame();
- LLTrace::getMasterThreadTrace().pullFromSlaveThreads();
+ LLTrace::getMasterThreadRecorder().pullFromSlaveThreads();
//clear call stack records
llclearcallstacks;