diff options
| author | richard <none@none> | 2010-01-06 11:17:38 -0800 |
|---|---|---|
| committer | richard <none@none> | 2010-01-06 11:17:38 -0800 |
| commit | 1bbd259f2d009a807a09aea15d01d0872f8b1cad (patch) | |
| tree | fe9e232d1f02e3f9288a22f3b477f74c8fbc0652 /indra/llui/llconsole.cpp | |
| parent | 7ec938e08da03d7029abc96c5cc0f5a7b8d683ca (diff) | |
EXT-3878 - Menus disappear when UI Size is < 1.00
EXT-3647 - Auto-scrolling of IMs should resume when user types in chat
EXT-3877 - Pinning two levels of menus prevents movement using arrow keys
EXT-1303 - Hyperlink text wraps in the middle of a word
reviewed by James
Diffstat (limited to 'indra/llui/llconsole.cpp')
| -rw-r--r-- | indra/llui/llconsole.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp index fa0abd55d0..7248581ec6 100644 --- a/indra/llui/llconsole.cpp +++ b/indra/llui/llconsole.cpp @@ -331,6 +331,11 @@ void LLConsole::Paragraph::updateLines(F32 screen_width, const LLFontGL* font, b } U32 drawable = font->maxDrawableChars(mParagraphText.c_str()+paragraph_offset, screen_width, line_end - paragraph_offset, TRUE); + if (drawable == 0) + { + // try again without wrapping on word boundaries + drawable = font->maxDrawableChars(mParagraphText.c_str()+paragraph_offset, screen_width, line_end - paragraph_offset, FALSE); + } if (drawable != 0) { |