diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-21 14:19:25 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-21 14:19:25 -0400 |
| commit | f64a79d9d14fe52dc9ac599bc9e4faf8009254ce (patch) | |
| tree | d14ff8f9cf8bd723b8d479446f47eeb4211e8326 /indra/llui/lltextbase.cpp | |
| parent | ee130adc60dea8530f82d90107198ebcbd63fded (diff) | |
| parent | 4539e5c8e93badc83e71045ba87ef81bf8740cab (diff) | |
merge changes for DRTVWR-171
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 7aeeae298f..ef17fa4887 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1699,9 +1699,6 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para while ( LLUrlRegistry::instance().findUrl(text, match, boost::bind(&LLTextBase::replaceUrl, this, _1, _2, _3)) ) { - - LLTextUtil::processUrlMatch(&match,this); - start = match.getStart(); end = match.getEnd()+1; @@ -1737,6 +1734,8 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para } } + LLTextUtil::processUrlMatch(&match,this); + // move on to the rest of the text after the Url if (end < (S32)text.length()) { |