diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-27 10:13:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-27 10:13:05 +0200 |
| commit | bcb5210f6b51b65174425849fbe4cbc53e424c8d (patch) | |
| tree | 04420f59b47894d7945a44d995b72d6badb1c02c /indra/llcommon/llsingleton.h | |
| parent | f25f51a20a7bcefcf51de5e71f827c74c659571a (diff) | |
| parent | ccefd2f719e97c353dd85b51098a29786924190c (diff) | |
Merge pull request #1063 from secondlife/marchcat/b-merge
Merge main into maint B
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 cbe5ab6406..64027c16c7 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.) |