diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-12 16:58:59 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-12 16:58:59 -0700 |
| commit | 32063b59994c4e08f37f59fddf6bb2e7af252a9d (patch) | |
| tree | 099f375fed88d77d262302913c8b22f84cd90e2e /indra/llui/lltextbase.cpp | |
| parent | 10967ef85961454a9209d7ab40f38923f8b03908 (diff) | |
EXP-1953: Altering the behavior of building an LLTextBase such that icons are appended in place rather than prepended out of context.
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()) { |