diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-21 10:58:23 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-21 10:58:23 -0400 |
| commit | ae5cf3cefaf6bf25f4478611505cbd58c5a3b112 (patch) | |
| tree | 5d6d6cf3bb925050232e2e28b7e5526963a5c3fc /indra/llui/lltextbase.cpp | |
| parent | 7c06c9a3d1769758f5e01662d4e546178b490408 (diff) | |
| parent | 71f56a2bc9697989cd012adb57abdc922aa8ae0a (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -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 c7730deae6..d58e4808df 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1625,7 +1625,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; |