summaryrefslogtreecommitdiff
path: root/indra/llcommon/llthread.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-12-12 10:45:13 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-12-12 10:45:13 -0500
commit642ea00a08d454dfb4eb5278b659260803816fc2 (patch)
tree7bc0734dcd80a78a597779c70bcf6c3f8324f949 /indra/llcommon/llthread.h
parent8a51346d6f0d9171263124c203b2194db914b47d (diff)
parentdbc91a7fac9513bdd879c5c2dc82208e08eaad2d (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;