diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-18 14:40:22 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-18 14:40:22 +0200 |
| commit | 9fdae4414f7307f4599d395cfed912cec1d825bd (patch) | |
| tree | 22a4996dd57fb98306e8b3c250372db9b49bbbcd /indra/llui/lltextbase.cpp | |
| parent | 215b95eb64ebea58d6f2bda5f90e307836aca093 (diff) | |
| parent | 125b779fb63cafe4e5df4d601542def1b4bc05f3 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index a06b7e237b..caaf47240f 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1509,7 +1509,7 @@ void LLTextBase::appendText(const std::string &new_text, bool prepend_newline, c std::string font_name = LLFontGL::nameFromFont(style_params.font()); std::string font_size = LLFontGL::sizeFromFont(style_params.font()); link_params.font.name(font_name); - link_params.font.size(font_name); + link_params.font.size(font_size); link_params.font.style("UNDERLINE"); link_params.link_href = match.getUrl(); |