diff options
author | Brad Kittenbrink <brad@lindenlab.com> | 2022-04-27 10:27:48 -0700 |
---|---|---|
committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-04-27 10:27:48 -0700 |
commit | a3ffa9f006b008b5faad248f700c8c2fbc6b74fd (patch) | |
tree | f674d4d4e3ab2d4ef4a7419594ea507506238232 /indra/llcommon/llframetimer.cpp | |
parent | 030d61ac58be38f9f8aafeb68b383d88d670080b (diff) | |
parent | bafa869c21cb8b329f94be6fa930a43d11699082 (diff) |
Merge remote-tracking branch 'origin/DRTVWR-546' into DRTVWR-559
Diffstat (limited to 'indra/llcommon/llframetimer.cpp')
-rw-r--r-- | indra/llcommon/llframetimer.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcommon/llframetimer.cpp b/indra/llcommon/llframetimer.cpp index 1e9920746b..c54029e8b4 100644 --- a/indra/llcommon/llframetimer.cpp +++ b/indra/llcommon/llframetimer.cpp @@ -29,6 +29,11 @@ #include "llframetimer.h" +// We don't bother building a stand alone lib; we just need to include the one source file for Tracy support +#if LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY || LL_PROFILER_CONFIGURATION == LL_PROFILER_CONFIG_TRACY_FAST_TIMER + #include "TracyClient.cpp" +#endif // LL_PROFILER_CONFIGURATION + // Static members //LLTimer LLFrameTimer::sInternalTimer; U64 LLFrameTimer::sStartTotalTime = totalTime(); |