1 files changed, 47 insertions, 26 deletions

diff --git a/linden/indra/newview/llconsole.cpp b/linden/indra/newview/llconsole.cpp
index 1ed0e17..ce092a7 100644
--- a/linden/indra/newview/llconsole.cpp
+++ b/linden/indra/newview/llconsole.cpp
@@ -118,6 +118,8 @@ void LLConsole::draw()
 {
         LLGLSUIDefault gls_ui;
 
+        addQueuedLines();
+
         // skip lines added more than mLinePersistTime ago
         F32 cur_time = mTimer.getElapsedTimeF32();
         
@@ -243,38 +245,57 @@ void LLConsole::addLine(const LLString& utf8line, F32 size, const LLColor4 &colo
 
 void LLConsole::addLine(const LLWString& wline, F32 size, const LLColor4 &color)
 {
-        if (!wline.empty() && mFont != NULL)
+        while (mLineQueue.size() >= mMaxLines)
+        {
+                mLineQueue.pop_front();
+        }
+        mLineQueue.push_back(LineInfo(wline, size, color, mTimer.getElapsedTimeF32()));
+}
+
+void LLConsole::addQueuedLines()
+{
+        for (line_queue_t::iterator iter = mLineQueue.begin();
+                 iter != mLineQueue.end(); ++iter)
         {
-                // Wrap lines that are longer than the view is wide.
-                S32 offset = 0;
-                while( offset < (S32)wline.length() )
+                LineInfo& line_info = *iter;
+                LLWString wline = line_info.wline;
+                //F32 size = line_info.size;
+                LLColor4 color = line_info.color;
+                if (!wline.empty() && mFont != NULL)
                 {
-                        S32 skip_chars; // skip '\n'
-                        // Figure out if a word-wrapped line fits here.
-                        LLWString::size_type line_end = wline.find_first_of(llwchar('\n'), offset);
-                        if (line_end != LLWString::npos)
-                        {
-                                skip_chars = 1; // skip '\n'
-                        }
-                        else
-                        {
-                                line_end = wline.size();
-                                skip_chars = 0;
-                        }
-                        U32 drawable = mFont->maxDrawableChars(wline.c_str()+offset, (F32)mRect.getWidth(), line_end-offset, TRUE);
-                        if (drawable != 0)
-                        {
-                                LLFixedBuffer::addLine(wline.substr(offset, drawable));
-                        }
-                        else
+                        // Wrap lines that are longer than the view is wide.
+                        S32 offset = 0;
+                        while( offset < (S32)wline.length() )
                         {
-                                // force a blank line
-                                LLFixedBuffer::addLine(" ");
+                                S32 skip_chars; // skip '\n'
+                                // Figure out if a word-wrapped line fits here.
+                                LLWString::size_type line_end = wline.find_first_of(llwchar('\n'), offset);
+                                if (line_end != LLWString::npos)
+                                {
+                                        skip_chars = 1; // skip '\n'
+                                }
+                                else
+                                {
+                                        line_end = wline.size();
+                                        skip_chars = 0;
+                                }
+                                U32 drawable = mFont->maxDrawableChars(wline.c_str()+offset, (F32)mRect.getWidth(), line_end-offset, TRUE);
+                                if (drawable != 0)
+                                {
+                                        LLFixedBuffer::addLine(wline.substr(offset, drawable));
+                                        mAddTimes[mAddTimes.size()-1] = line_info.add_time;
+                                }
+                                else
+                                {
+                                        // force a blank line
+                                        LLFixedBuffer::addLine(" ");
+                                }
+                                mColors.push_back(color);
+                                offset += (drawable + skip_chars);
                         }
-                        mColors.push_back(color);
-                        offset += (drawable + skip_chars);
                 }
         }
+        mLineQueue.clear();
 }
 
 void LLConsole::removeExtraLines()