diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-01-04 14:43:45 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-01-04 14:43:45 -0500 |
| commit | 197a1ddef8a0b7bc7872339ec82b2a5bc5cbb3b4 (patch) | |
| tree | 31b2bf3eeb026334ed20cd6e4f8fb15f91a07b0f /indra/llcommon/llmutex.h | |
| parent | 5a6174c0853f5a140343725312f2b63b42f2bbad (diff) | |
| parent | a592292242e29d0379ee72572a434359e1e892d1 (diff) | |
DRTVWR-589: Merge branch 'main' into DRTVWR-589
Diffstat (limited to 'indra/llcommon/llmutex.h')
| -rw-r--r-- | indra/llcommon/llmutex.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/llmutex.h b/indra/llcommon/llmutex.h index 838d7d34c0..0d70da6178 100644 --- a/indra/llcommon/llmutex.h +++ b/indra/llcommon/llmutex.h @@ -36,7 +36,8 @@ //============================================================================ -#define MUTEX_DEBUG (LL_DEBUG || LL_RELEASE_WITH_DEBUG_INFO) +//#define MUTEX_DEBUG (LL_DEBUG || LL_RELEASE_WITH_DEBUG_INFO) +#define MUTEX_DEBUG 0 //disable mutex debugging as it's interfering with profiles #if MUTEX_DEBUG #include <map> @@ -61,7 +62,7 @@ protected: mutable LLThread::id_t mLockingThread; #if MUTEX_DEBUG - std::map<LLThread::id_t, BOOL> mIsLocked; + std::unordered_map<LLThread::id_t, BOOL> mIsLocked; #endif }; |