From aeec2661071ff14c3a9526a24a629443264a635b Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Tue, 20 Sep 2011 12:11:04 -0400 Subject: 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. --- indra/llcommon/llthread.h | 10 +++++----- 1 file 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 { -- cgit v1.2.3