diff options
| author | Richard Linden <none@none> | 2013-12-05 21:59:04 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-12-05 21:59:04 -0800 |
| commit | 5d2241b3d6373f528626ebb043aeea8ad8dc355f (patch) | |
| tree | 773e3e6751f8cdfdbb4433e280ed23caf4f8c0f0 /indra/newview | |
| parent | 24a2ba735540f896bb84dfdbaff8644b1d60044b (diff) | |
| parent | 6b84d405582e87e0b7e0a3b0cbc5635651af5e3b (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | 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 9a31b6b51f..a7f5eb48a4 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1325,7 +1325,7 @@ bool LLAppViewer::mainLoop() LLTrace::get_frame_recording().nextPeriod(); LLTrace::BlockTimer::logStats(); - LLTrace::get_master_thread_recorder()->pullFromChildren(); + LLTrace::get_thread_recorder()->pullFromChildren(); //clear call stack records LL_CLEAR_CALLSTACKS(); |