diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-21 15:04:12 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-21 15:04:12 -0700 |
| commit | 86ba458ebcc979bdd03b490842311bd5621fb0b4 (patch) | |
| tree | f36c5eeea9e2371b797f73b3a18db032ce888c4b /indra | |
| parent | c8970618567e867b619c9fb5e225978bc5f66781 (diff) | |
merge fix
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 4d835b869f..66c5af85c8 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1649,15 +1649,8 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para } // output the styled Url - // output the styled Url (unless we've been asked to suppress hyperlinking) - if (match.isLinkDisabled()) - { - appendAndHighlightText(match.getLabel(), part, style_params); - } - else - { - appendAndHighlightText(match.getLabel(), part, link_params); - + appendAndHighlightTextImpl(match.getLabel(), part, link_params); + // set the tooltip for the Url label if (! match.getTooltip().empty()) { |