diff options
| author | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-10-21 10:59:11 -0400 |
|---|---|---|
| committer | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-10-21 10:59:11 -0400 |
| commit | 19836c86e98b9f95d47e5dfe4a2ce599767a4523 (patch) | |
| tree | d481049fddb0f3e24aa682171e7a2bf01dd36cbc /indra/llui/lltextbase.cpp | |
| parent | 6691bf637e71f40d1bf12065c7caaf96bd9aaf50 (diff) | |
| parent | 71f56a2bc9697989cd012adb57abdc922aa8ae0a (diff) | |
Merge 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 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; |