diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-22 14:15:58 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-22 14:15:58 -0500 |
| commit | bd84d36c9d08878c895c896e097e8e3310b61cf3 (patch) | |
| tree | e2e333ba15c131dfb25c4baf54bcb98fd2a3bd46 /indra/llui/llconsole.cpp | |
| parent | 00fdc0acd5e27d353c070706e838a35bf889a536 (diff) | |
| parent | 04712617c55c53dbec1f73a4e8834ebe3167e5ed (diff) | |
merge
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. |