summaryrefslogtreecommitdiff
path: root/indra/llcommon/llthread.h
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-12-09 12:23:39 -0600
committerDave Parks <davep@lindenlab.com>2011-12-09 12:23:39 -0600
commit5c17bfd5139e70549f730ba4b066f7fa447d53ce (patch)
treeb22220ebcd35b18e9c775dc6e2322f0d7ac08ebc /indra/llcommon/llthread.h
parent561548fadd3308f1c9862dc226c992bc026736a0 (diff)
parent723ce604560f71622d0381e47230b87f07262d99 (diff)
Merge
Diffstat (limited to 'indra/llcommon/llthread.h')
-rw-r--r--indra/llcommon/llthread.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
index b0a1c9e12b..40291a2569 100644
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -187,18 +187,11 @@ public:
LLMutexLock(LLMutex* mutex)
{
mMutex = mutex;
-
- if(mMutex)
- {
- mMutex->lock();
- }
+ mMutex->lock();
}
~LLMutexLock()
{
- if(mMutex)
- {
- mMutex->unlock();
- }
+ mMutex->unlock();
}
private:
LLMutex* mMutex;