summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2011-09-20 12:11:04 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2011-09-20 12:11:04 -0400
commitaeec2661071ff14c3a9526a24a629443264a635b (patch)
tree91dc6f689ded236959ecffcebfa4534fd69a5c57
parent943c23ba7391cfd47921d3e67f4131a83fe5f907 (diff)
SH-2434 revert mac viewer sometimes freezes at start up
mutex mode change was ineffective, reverting the patch. Will do future tests on a sidebranch.
-rw-r--r--indra/llcommon/llthread.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
index 3f7f918f57..b631b96252 100644
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -151,15 +151,15 @@ protected:
//============================================================================
-//#define MUTEX_DEBUG (LL_DEBUG || LL_RELEASE_WITH_DEBUG_INFO)
+#define MUTEX_DEBUG (LL_DEBUG || LL_RELEASE_WITH_DEBUG_INFO)
-//#ifdef MUTEX_DEBUG
+#ifdef MUTEX_DEBUG
// We really shouldn't be using recursive locks. Make sure of that in debug mode.
#define MUTEX_FLAG APR_THREAD_MUTEX_UNNESTED
-//#else
+#else
// Use the fastest platform-optimal lock behavior (can be recursive or non-recursive).
-//#define MUTEX_FLAG APR_THREAD_MUTEX_DEFAULT
-//#endif
+#define MUTEX_FLAG APR_THREAD_MUTEX_DEFAULT
+#endif
class LL_COMMON_API LLMutexBase
{