summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-05-04 09:01:22 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-05-04 09:01:22 -0400
commita57013082d9cd890e24d2a79dedd405c24471e6d (patch)
tree51742d1ec6fc467a7036dcff49a03fdd0f44ec59 /indra/llcommon
parent21ddaa690875450bbd2f7d665da22d390a0f2a88 (diff)
parenta9dca4577337037f1b4a62713927871666014043 (diff)
DRTVWR-559: Merge 'DRTVWR-559' into DRTVWR-559-zapfunc
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llmutex.h5
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
};