diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-12-21 15:18:56 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-12-21 15:18:56 -0500 |
| commit | 55f1d95d978dd6ac38c9f77882399323567fb634 (patch) | |
| tree | 1824bd91af344b22c00aa1899856402f950e7340 /indra/llcommon | |
| parent | 5dc8e44c767f839e3d2d1d926bfdeee969f2492e (diff) | |
| parent | ec06aa129f839cc98aaa8006d6467241281da9fa (diff) | |
merge changes for vmrg-210
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; |