summaryrefslogtreecommitdiff
path: root/indra/llcommon/llfixedbuffer.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-09-02 13:48:29 -0400
committerOz Linden <oz@lindenlab.com>2011-09-02 13:48:29 -0400
commit0ab6eee0996c78d32b722157140cea5a21a5e460 (patch)
tree2a0e90651e3cb0e236c9091b33c64d2cb7a616f7 /indra/llcommon/llfixedbuffer.cpp
parentfcc51bd5b01f2a383ad057898484ac9938219b11 (diff)
parent8efd992d508eecec42648af4a7bb980fc0cc19cc (diff)
merge changes for storm-1027
Diffstat (limited to 'indra/llcommon/llfixedbuffer.cpp')
-rw-r--r--indra/llcommon/llfixedbuffer.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcommon/llfixedbuffer.cpp b/indra/llcommon/llfixedbuffer.cpp
index d394f179fb..4b5cdbe288 100644
--- a/indra/llcommon/llfixedbuffer.cpp
+++ b/indra/llcommon/llfixedbuffer.cpp
@@ -30,8 +30,7 @@
LLFixedBuffer::LLFixedBuffer(const U32 max_lines)
: LLLineBuffer(),
- mMaxLines(max_lines),
- mMutex(NULL)
+ mMaxLines(max_lines)
{
mTimer.reset();
}