diff options
| author | richard <none@none> | 2010-01-06 12:23:56 -0800 |
|---|---|---|
| committer | richard <none@none> | 2010-01-06 12:23:56 -0800 |
| commit | 49660730308fb6d5301d1617402a353a21e9d9be (patch) | |
| tree | 90887ce7d989a2ceb6a5e5f23aa9b2a123ab5abb /indra/llui/llconsole.cpp | |
| parent | 3b7080a6b112c492a9025ae1a350db0ab4e88e50 (diff) | |
moved clipping logic inside LLFontGL::maxDrawableChars controlled by EWordWrapStyle
fixes regression introduced in 3eef5ce9ae1e6fc62b9b52ce859501dd4e70fadf
reviewed by Brad
Diffstat (limited to 'indra/llui/llconsole.cpp')
| -rw-r--r-- | indra/llui/llconsole.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp index 7248581ec6..f69e935754 100644 --- a/indra/llui/llconsole.cpp +++ b/indra/llui/llconsole.cpp @@ -330,12 +330,7 @@ void LLConsole::Paragraph::updateLines(F32 screen_width, const LLFontGL* font, b skip_chars = 0; } - 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); - } + U32 drawable = font->maxDrawableChars(mParagraphText.c_str()+paragraph_offset, screen_width, line_end - paragraph_offset, LLFontGL::WORD_BOUNDARY_IF_POSSIBLE); if (drawable != 0) { |