diff options
| author | Richard Linden <none@none> | 2012-11-27 20:19:10 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-27 20:19:10 -0800 |
| commit | 0e1283cf6d17514a9a32595fc29df38a4b4b2d3a (patch) | |
| tree | 807704238da011a85fd6dd06735c8c55829de98c /indra/newview | |
| parent | 1c894c05c10ef37be6507ee4bc4e9173506adfb6 (diff) | |
| parent | 93aca485ba08a82a6bd3a2fc31deca18af0d1478 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 839094fc47..713ae789a7 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1353,6 +1353,7 @@ bool LLAppViewer::mainLoop() gGLActive = FALSE; } + LLTrace::get_frame_recording().nextPeriod(); } pingMainloopTimeout("Main:Sleep"); @@ -4371,9 +4372,6 @@ void LLAppViewer::idle() update_statistics(); } - LLTrace::get_frame_recording().nextPeriod(); - - //////////////////////////////////////// // // Handle the regular UI idle callbacks as well as |