diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-17 17:29:15 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-17 17:29:15 -0800 |
| commit | 21621b4b0e1309b868436cc1a183b47b1aac17a9 (patch) | |
| tree | b29ed79e563f1e50221b03ede0342135042c1628 /indra/llui/llconsole.cpp | |
| parent | cb3b21a40a410f9279edf5beb7e1f54d9037255b (diff) | |
| parent | 3ef0d029ca06c991abcde2d59cd8d9478127b980 (diff) | |
Automated merge with ssh://rick@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. |