diff options
| author | Chuck Linden <chuck@lindenlab.com> | 2010-02-19 14:32:55 -0500 |
|---|---|---|
| committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-19 14:32:55 -0500 |
| commit | 9aee0cfa716736659af777c9fccd60b8618dc9d4 (patch) | |
| tree | bd6f329c88fc27fb697f6660d9eb51bcb14b9585 /indra/llui/llconsole.cpp | |
| parent | cd9a2a6a4ab8d1d989110908a3702ba34d1f6168 (diff) | |
| parent | 65f8b95ae8e93c3b946e43eea89bcb631723ca6c (diff) | |
Automated merge with file:///Users/chuck/Documents/hg/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. |