diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-02-02 14:26:33 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-02-02 14:26:33 -0500 |
| commit | 5b2dbbadf70ee33bfd288b6384ae0d51715488b1 (patch) | |
| tree | 48d7678fbbca7359db17b472e3233c1d2874828b /indra/llcommon/llthread.cpp | |
| parent | 03290257345c22f909cf1cfac3981e7e07820d21 (diff) | |
| parent | 34408bed2644ff957502454f05c21c31fec90009 (diff) | |
merge changes for latest 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; |