Second Life viewer sources 1.23.0-RC

1 files changed, 9 insertions, 1 deletions

diff --git a/linden/indra/llcommon/llfixedbuffer.cpp b/linden/indra/llcommon/llfixedbuffer.cpp
index a819150..e9d6029 100644
--- a/linden/indra/llcommon/llfixedbuffer.cpp
+++ b/linden/indra/llcommon/llfixedbuffer.cpp
@@ -16,7 +16,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -32,6 +33,7 @@
 #include "llfixedbuffer.h"
 
 LLFixedBuffer::LLFixedBuffer(const U32 max_lines)
+                          : mMutex(NULL)
 {
         mMaxLines = max_lines;
         mTimer.reset();
@@ -46,9 +48,11 @@ LLFixedBuffer::~LLFixedBuffer()
 
 void LLFixedBuffer::clear()
 {
+        mMutex.lock() ;
         mLines.clear();
         mAddTimes.clear();
         mLineLengths.clear();
+        mMutex.unlock() ;
 
         mTimer.reset();
 }
@@ -69,9 +73,11 @@ void LLFixedBuffer::addLine(const LLWString& line)
 
         removeExtraLines();
 
+        mMutex.lock() ;
         mLines.push_back(line);
         mLineLengths.push_back((S32)line.length());
         mAddTimes.push_back(mTimer.getElapsedTimeF32());
+        mMutex.unlock() ;
 }
 
 
@@ -85,10 +91,12 @@ void LLFixedBuffer::setMaxLines(S32 max_lines)
 
 void LLFixedBuffer::removeExtraLines()
 {
+        mMutex.lock() ;
         while ((S32)mLines.size() > llmax((S32)0, (S32)(mMaxLines - 1)))
         {
                 mLines.pop_front();
                 mAddTimes.pop_front();
                 mLineLengths.pop_front();
         }
+        mMutex.unlock() ;
 }