diff options
| author | Richard Linden <none@none> | 2012-11-15 19:46:09 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-15 19:46:09 -0800 |
| commit | c136b432140f892a56d4996d5ed77e903ff0b32d (patch) | |
| tree | e1af9a407b0af582349396d8cb51e2e794260d43 /indra/newview/llappviewer.cpp | |
| parent | 9d77e030d9a0d23cebce616631677459eec1612c (diff) | |
SH-3406 WIP convert fast timers to lltrace system
eliminated min and max macros from windows.h
got rest of viewer to compile against llfasttimer changes
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 c6ed8d5071..9d4ed833b8 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2033,7 +2033,7 @@ bool LLAppViewer::initThreads() if (LLTrace::BlockTimer::sLog || LLTrace::BlockTimer::sMetricLog) { - LLTrace::BlockTimer::sLogLock = new LLMutex(NULL); + LLTrace::BlockTimer::setLogLock(new LLMutex(NULL)); mFastTimerLogThread = new LLFastTimerLogThread(LLTrace::BlockTimer::sLogName); mFastTimerLogThread->start(); } |