diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-20 20:54:24 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-20 20:54:24 -0700 |
| commit | 187093eb9d82467852d3297411a9370d4e8c81e9 (patch) | |
| tree | cdf71c32ca5192016c78d45702d498062f97e8b8 /indra/llui | |
| parent | f38d21fe60945d71f8740f6aba58b40d4a722d58 (diff) | |
| parent | d97355a19f3b88512105965cfd752956f0230b41 (diff) | |
STORM-390 : merge with viewer-development
Diffstat (limited to 'indra/llui')
| -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 9adeddca99..758df418e8 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1622,7 +1622,7 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para style_params.fillFrom(getDefaultStyleParams()); S32 part = (S32)LLTextParser::WHOLE; - if(mParseHTML) + if (mParseHTML && !style_params.is_link) // Don't search for URLs inside a link segment (STORM-358). { S32 start=0,end=0; LLUrlMatch match; |