diff options
| author | Richard Linden <none@none> | 2012-12-18 20:07:25 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-12-18 20:07:25 -0800 |
| commit | c219282f5de753a044cecb53bd806145f68add9a (patch) | |
| tree | 9bea36fd9fba8f41fed4c04ba413bf5d41993ca0 /indra/newview/llappviewer.cpp | |
| parent | 1f56e57008f5a50c9e75fc0b4512c483ac359a52 (diff) | |
SH-3406 WIP convert fast timers to lltrace system
removed some potential data races
got memory stats recording in trace system
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 c986954867..4209e6612e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1233,8 +1233,8 @@ bool LLAppViewer::mainLoop() while (!LLApp::isExiting()) { LLFastTimer _(FTM_FRAME); - LLTrace::TimeBlock::nextFrame(); LLTrace::get_frame_recording().nextPeriod(); + LLTrace::TimeBlock::logStats(); LLTrace::getMasterThreadRecorder().pullFromSlaveThreads(); |