diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-14 06:38:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-14 06:38:17 +0300 |
| commit | 31774e82c4c9ba2c1243fbc417174e966314dfca (patch) | |
| tree | 340e51989a998bf3e026722a4d304f8e71554629 /indra/llcommon/llsingleton.cpp | |
| parent | 2921deed78af5751b3788aa8d8e1297306b2abab (diff) | |
| parent | 6f0e6765218543c8e0d84931d37460026bc6bb3c (diff) | |
Merge pull request #2282 from RyeMutt/tracy-update
Update tracy to 0.11 and improve developer experience
Diffstat (limited to 'indra/llcommon/llsingleton.cpp')
| -rw-r--r-- | indra/llcommon/llsingleton.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llcommon/llsingleton.cpp b/indra/llcommon/llsingleton.cpp index d00e703a10..05dc3cde79 100644 --- a/indra/llcommon/llsingleton.cpp +++ b/indra/llcommon/llsingleton.cpp @@ -59,9 +59,8 @@ private: // it's safe to log -- which involves querying a different LLSingleton -- // which requires accessing the master list. typedef std::recursive_mutex mutex_t; - typedef std::unique_lock<mutex_t> lock_t; - - mutex_t mMutex; + LL_PROFILE_MUTEX_NAMED(mutex_t, mMutex, "Singleton MasterList"); + typedef std::unique_lock<decltype(mMutex)> lock_t; public: // Instantiate this to both obtain a reference to MasterList::instance() |