diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-02-24 16:12:43 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-02-24 16:12:43 +0100 |
| commit | e0d1ddab212103ba11a72783ce3b0a26ea8c0c55 (patch) | |
| tree | 44011ae0491941af0bfc1957d5f3b408c81123a4 /indra/llcommon/llthread.cpp | |
| parent | e615660823e680e824d2db0f1a59917597e64a13 (diff) | |
| parent | 289d756ea86bd3898f41592146d8f549cd056846 (diff) | |
Merge with viewer-development
Diffstat (limited to 'indra/llcommon/llthread.cpp')
| -rw-r--r-- | indra/llcommon/llthread.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index 4063cc730b..a6ad6b125c 100644 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -337,11 +337,7 @@ LLMutex::~LLMutex() void LLMutex::lock() { -#if LL_DARWIN - if (mLockingThread == LLThread::currentID()) -#else - if (mLockingThread == sThreadID) -#endif + if(isSelfLocked()) { //redundant lock mCount++; return; @@ -398,6 +394,15 @@ bool LLMutex::isLocked() } } +bool LLMutex::isSelfLocked() +{ +#if LL_DARWIN + return mLockingThread == LLThread::currentID(); +#else + return mLockingThread == sThreadID; +#endif +} + U32 LLMutex::lockingThread() const { return mLockingThread; |