diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-08-27 07:00:13 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-08-27 07:00:13 +0000 |
| commit | 134dc986361256d71884257cb870a1f1ac6a848c (patch) | |
| tree | 5dc0b5719916977b4a35005aed24bd4aedd19d93 /indra/llcommon/llfasttimer.h | |
| parent | 7637f9845b351a7cb3e41d97db7d3715e119e2df (diff) | |
| parent | cdf2bdafd394a97b917cc0a71b2bc8531cce40c7 (diff) | |
Merged in SL-15709-Tracy (pull request #634)
SL-15709: Add Tracy support to viewer
Diffstat (limited to 'indra/llcommon/llfasttimer.h')
| -rw-r--r-- | indra/llcommon/llfasttimer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h index dfc63d08a2..9bd93d7240 100644 --- a/indra/llcommon/llfasttimer.h +++ b/indra/llcommon/llfasttimer.h @@ -38,7 +38,10 @@ #define LL_FAST_TIMER_ON 1 #define LL_FASTTIMER_USE_RDTSC 1 +// NOTE: Also see llprofiler.h +#if !defined(LL_PROFILER_CONFIGURATION) #define LL_RECORD_BLOCK_TIME(timer_stat) const LLTrace::BlockTimer& LL_GLUE_TOKENS(block_time_recorder, __LINE__)(LLTrace::timeThisBlock(timer_stat)); (void)LL_GLUE_TOKENS(block_time_recorder, __LINE__); +#endif // LL_PROFILER_CONFIGURATION namespace LLTrace { |