diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-17 16:36:22 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-17 16:36:22 +0200 |
| commit | 402e957c56113550e53a3892908c6c7a5c16783a (patch) | |
| tree | 33cf9a73825392b2ed08d1de91c6bd4c0a28d83b /indra/llui | |
| parent | 53be27e742b642c1642c3289e3e11b300a14d360 (diff) | |
| parent | 2217a677104ffadab8815a0886d66ac264e74792 (diff) | |
Merge from default branch.
Added missing trailing newline to fix Linux build.
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 7b1aaac35c..a06b7e237b 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1507,8 +1507,11 @@ void LLTextBase::appendText(const std::string &new_text, bool prepend_newline, c link_params.color = match.getColor(); // apply font name from requested style_params std::string font_name = LLFontGL::nameFromFont(style_params.font()); - link_params.font.name.setIfNotProvided(font_name); - link_params.font.style = "UNDERLINE"; + std::string font_size = LLFontGL::sizeFromFont(style_params.font()); + link_params.font.name(font_name); + link_params.font.size(font_name); + link_params.font.style("UNDERLINE"); + link_params.link_href = match.getUrl(); // output the text before the Url |