diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-12-21 15:21:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-12-21 15:21:12 -0500 |
| commit | 570d562f5871f40bd7f8c683db5316ffd0133335 (patch) | |
| tree | ff29baa075e3de2030bfad8755be6ef261691416 /indra/llcommon | |
| parent | b022ebf13c9a227f87a112419e237894a1231c8c (diff) | |
| parent | 55f1d95d978dd6ac38c9f77882399323567fb634 (diff) | |
merge changes for vmrg-209 and vmrg-210 back from beta branch
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; |