diff options
| author | Richard Linden <none@none> | 2013-05-29 17:03:45 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-05-29 17:03:45 -0700 |
| commit | 174cfa0a7a49110dc2ff13850aa5ff48916711dc (patch) | |
| tree | f37413130f8c2628e5c0652458fc4fa4e0a653ba /indra/newview/llappviewer.cpp | |
| parent | 52e8b2a1a279e13a39a95b32a301780998b8d8c4 (diff) | |
| parent | 074c1f1de45f60059c97cf9cfd0bbb9fddbb52c4 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting/
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index a602f0d78e..a049aabe74 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1244,7 +1244,7 @@ bool LLAppViewer::mainLoop() LLTrace::get_frame_recording().nextPeriod(); LLTrace::TimeBlock::logStats(); - LLTrace::getMasterThreadRecorder().pullFromSlaveThreads(); + LLTrace::getUIThreadRecorder().pullFromSlaveThreads(); //clear call stack records llclearcallstacks; |