diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:22:10 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:22:10 -0800 |
| commit | 890ec637d41330a2a91d23b09b6aaaf49738d19a (patch) | |
| tree | b093f98112fb0cfdcad5452df1b266f1e0052fc0 /indra/llui/llconsole.cpp | |
| parent | 1d1e4c7abe5c46cfafbc351e8cad3197d2befefc (diff) | |
| parent | 4ab945c9f0000ead1eca22eefe0829bf3c15d7da (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
Diffstat (limited to 'indra/llui/llconsole.cpp')
| -rw-r--r-- | indra/llui/llconsole.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp index a4f69e7ac1..badbddc3cc 100644 --- a/indra/llui/llconsole.cpp +++ b/indra/llui/llconsole.cpp @@ -300,7 +300,8 @@ void LLConsole::Paragraph::updateLines(F32 screen_width, const LLFontGL* font, b S32 paragraph_offset = 0; //Offset into the paragraph text. // Wrap lines that are longer than the view is wide. - while( paragraph_offset < (S32)mParagraphText.length() ) + while( paragraph_offset < (S32)mParagraphText.length() && + mParagraphText[paragraph_offset] != 0) { S32 skip_chars; // skip '\n' // Figure out if a word-wrapped line fits here. |