diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-01-19 11:38:02 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-01-19 11:38:02 -0500 |
commit | 0752cc07921664af2e13588b1aaaf3c47546e3be (patch) | |
tree | 697d8f9b5384e76a333a6a16f758198e5b33ef07 /indra/llcommon/llsingleton.h | |
parent | f21666bd9a4fe35b325c23c4b46076be24016bfc (diff) | |
parent | 586e4cd090b22f11a68fa635e598847ce3b84d21 (diff) |
DRTVWR-601: Merge branch 'release/gltf-maint2' into DRTVWR-601-gha-libs
Diffstat (limited to 'indra/llcommon/llsingleton.h')
-rw-r--r-- | indra/llcommon/llsingleton.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h index 51ef514cf7..fba8301c4d 100644 --- a/indra/llcommon/llsingleton.h +++ b/indra/llcommon/llsingleton.h @@ -455,7 +455,7 @@ public: static DERIVED_TYPE* getInstance() { - LL_PROFILE_ZONE_SCOPED_CATEGORY_THREAD; + //LL_PROFILE_ZONE_SCOPED_CATEGORY_THREAD; // TODO -- reenable this when we have a fix for using Tracy with coroutines // We know the viewer has LLSingleton dependency circularities. If you // feel strongly motivated to eliminate them, cheers and good luck. // (At that point we could consider a much simpler locking mechanism.) |