diff options
| author | angela <angela@lindenlab.com> | 2009-11-17 16:34:06 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-17 16:34:06 +0800 |
| commit | 2217a677104ffadab8815a0886d66ac264e74792 (patch) | |
| tree | 4f4f45bc490756a1a41fb09f39e1cdb50822dc4d /indra/llui | |
| parent | ccc72757ef23fa7ffba066e5bdaf05e3f8a95cca (diff) | |
| parent | 0098bf40ea73078e2164ae55a8fa2f9049d0d4e9 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
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 |