summaryrefslogtreecommitdiff
path: root/indra/llcommon/linden_common.h
diff options
context:
space:
mode:
authorMichael Pohoreski <ptolemy@lindenlab.com>2021-08-27 07:00:13 +0000
committerMichael Pohoreski <ptolemy@lindenlab.com>2021-08-27 07:00:13 +0000
commit134dc986361256d71884257cb870a1f1ac6a848c (patch)
tree5dc0b5719916977b4a35005aed24bd4aedd19d93 /indra/llcommon/linden_common.h
parent7637f9845b351a7cb3e41d97db7d3715e119e2df (diff)
parentcdf2bdafd394a97b917cc0a71b2bc8531cce40c7 (diff)
Merged in SL-15709-Tracy (pull request #634)
SL-15709: Add Tracy support to viewer
Diffstat (limited to 'indra/llcommon/linden_common.h')
-rw-r--r--indra/llcommon/linden_common.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/linden_common.h b/indra/llcommon/linden_common.h
index e5a913a6a9..45ac43910c 100644
--- a/indra/llcommon/linden_common.h
+++ b/indra/llcommon/linden_common.h
@@ -60,4 +60,6 @@
#include "llerror.h"
#include "llfile.h"
+#include "llprofiler.h" // must be before fast timer; needed due to LLThreads potentially needing access to tracy
+
#endif