diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-17 18:35:38 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-17 18:35:38 +0000 |
| commit | 939e48d38cf9f15e1f7220cc3860810badd8a778 (patch) | |
| tree | e7135ea43d8945c173c5cade2c3767193fa76f56 /indra/llui/lltextbase.cpp | |
| parent | a402f4894d72209f9ac9bc9d7962c28b3c26bb18 (diff) | |
| parent | 6253e2611d3ecf4ff5c778d0e53f34aed06f35da (diff) | |
merge.
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -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..caaf47240f 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_size); + link_params.font.style("UNDERLINE"); + link_params.link_href = match.getUrl(); // output the text before the Url |