diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-12-05 13:23:38 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-12-05 13:23:38 -0700 |
| commit | c278f259c684d32a1da339fd4d0b0d4226916de0 (patch) | |
| tree | 170cbe1ee22c8a37009f874ea9f4da58405ec744 /indra/llcommon | |
| parent | 46a8ee0263aff727fde98874a720d1f929d91141 (diff) | |
| parent | 09feaac844d67a94ffe8c98a201e1e7f2f84be9a (diff) | |
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llthread.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h index 40291a2569..b0a1c9e12b 100644 --- a/indra/llcommon/llthread.h +++ b/indra/llcommon/llthread.h @@ -187,11 +187,18 @@ public: LLMutexLock(LLMutex* mutex) { mMutex = mutex; - mMutex->lock(); + + if(mMutex) + { + mMutex->lock(); + } } ~LLMutexLock() { - mMutex->unlock(); + if(mMutex) + { + mMutex->unlock(); + } } private: LLMutex* mMutex; |