diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-12-05 13:23:05 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-12-05 13:23:05 -0700 |
| commit | 09feaac844d67a94ffe8c98a201e1e7f2f84be9a (patch) | |
| tree | 05e20cabe3fb174084fa082c7329148234ab1db2 /indra/llcommon | |
| parent | 8f0f4806121b36efe69fc2bdd54610ee6a4319e4 (diff) | |
fix for sh-2738: Texture fetching freezes due to LLcurl
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; |