diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-12-21 17:58:30 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-12-21 17:58:30 -0500 |
| commit | 7c0b98aa83faacf27da2b71e186399e232a1a376 (patch) | |
| tree | 3224b7f2ba4b7541610b927093f80f679707aa92 /indra/llcommon | |
| parent | ef08cd9dc619f692ce4e13ba1268c117a75ab2bf (diff) | |
| parent | 55f1d95d978dd6ac38c9f77882399323567fb634 (diff) | |
merge
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; |