diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-12-19 12:44:07 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-12-19 12:44:07 -0700 |
| commit | c7f9c3af3c16fbc1411719c63786ac1ecb86f89a (patch) | |
| tree | 00eec6f57d4952121ef01a4d78753b7e0f63cf65 /indra/llcommon | |
| parent | c0b4ec6fe72d703191b28749cfd30262d131b245 (diff) | |
| parent | 4ec112bfce19d4bf09ef79b3b3195dda24148730 (diff) | |
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llthread.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h index 40291a2569..f0e0de6173 100644 --- a/indra/llcommon/llthread.h +++ b/indra/llcommon/llthread.h @@ -187,11 +187,14 @@ public: LLMutexLock(LLMutex* mutex) { mMutex = mutex; - mMutex->lock(); + + if(mMutex) + mMutex->lock(); } ~LLMutexLock() { - mMutex->unlock(); + if(mMutex) + mMutex->unlock(); } private: LLMutex* mMutex; |