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/llcommon/llfasttimer.h | |
| 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/llcommon/llfasttimer.h')
| -rw-r--r-- | indra/llcommon/llfasttimer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h index 69a6773b12..af9b360e01 100644 --- a/indra/llcommon/llfasttimer.h +++ b/indra/llcommon/llfasttimer.h @@ -98,6 +98,7 @@ public: static BlockTimer& getRootTimer(); static void pushLog(LLSD sd); + static void setLogLock(LLMutex* mutex); friend class Time; @@ -329,6 +330,6 @@ LL_FORCE_INLINE Time::~Time() } -typedef LLTrace::Time LLFastTimer; +typedef LLTrace::Time LLFastTimer; #endif // LL_LLFASTTIMER_H |