From 86ba458ebcc979bdd03b490842311bd5621fb0b4 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Mon, 21 Jun 2010 15:04:12 -0700 Subject: merge fix --- indra/llui/lltextbase.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'indra') 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()) { -- cgit v1.2.3