diff options
| author | Richard Linden <none@none> | 2013-06-30 13:32:34 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-30 13:32:34 -0700 |
| commit | 2fc422f39ddaca25c69e8cf2092a9d66840379f3 (patch) | |
| tree | 61587ceb0f5a3298769bcce9ca29116fa0e793db /indra/newview | |
| parent | ffa7123bb5187e1da491a8f475d696053d9c9ee4 (diff) | |
fixed memory leak due to implementation of LLThreadLocalSingleton
removed LLThreadLocalSingleton
collapsed all thread recorder classes to single type, LLTrace::ThreadRecorder
moved fasttimer stack head to llthreadlocalsingletonpointer via ThreadRecorder
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 9308f0f4e9..348eb43b5e 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1297,7 +1297,7 @@ bool LLAppViewer::mainLoop() LLTrace::get_frame_recording().nextPeriod(); LLTrace::TimeBlock::logStats(); - LLTrace::getUIThreadRecorder().pullFromSlaveThreads(); + LLTrace::getUIThreadRecorder().pullFromChildren(); //clear call stack records llclearcallstacks; |