diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 15:28:09 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-18 15:28:09 +0000 |
| commit | 2d1c918837cdc5a948619ac2b483d1719aac4069 (patch) | |
| tree | 7e0b4842a2f55cadd4cc44cb3d95d9581c2e5716 /indra/llui | |
| parent | 161aff8e86ae690e6ba4124c9433bfed5025b133 (diff) | |
| parent | fa03910a34e5c32149793605bc481de00ada5e1c (diff) | |
viewer2 merge.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llconsole.cpp | 3 | ||||
| -rw-r--r-- | indra/llui/lltabcontainer.cpp | 3 |
2 files changed, 4 insertions, 2 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. diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index ffaf84cb9b..c9bdacd4b7 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -214,7 +214,8 @@ LLTabContainer::Params::Params() last_tab("last_tab"), use_custom_icon_ctrl("use_custom_icon_ctrl", false), tab_icon_ctrl_pad("tab_icon_ctrl_pad", 0), - use_ellipses("use_ellipses") + use_ellipses("use_ellipses"), + font_halign("font_halign") { name(std::string("tab_container")); mouse_opaque = false; |