diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-08-31 19:55:19 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-08-31 19:55:19 -0400 |
| commit | 704405903f8d1606ef98df76d37c83931e5368ab (patch) | |
| tree | 7a970bcfad80962c4d0e96e9351ed718da687dff /indra/llui | |
| parent | 85d659f44d2badfd42ee9b1ae7cd0971806672d4 (diff) | |
| parent | 3cabca8df62ae8ee815dd7d885f14f5a7d0ea98d (diff) | |
pull from viewer-development
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llspinctrl.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/lltextbase.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp index 4890a75c4a..9decfa0b25 100644 --- a/indra/llui/llspinctrl.cpp +++ b/indra/llui/llspinctrl.cpp @@ -128,7 +128,7 @@ LLSpinCtrl::LLSpinCtrl(const LLSpinCtrl::Params& p) } else //should accept int numbers { - params.prevalidate_callback(&LLTextValidate::validateNonNegativeS32); + params.prevalidate_callback(&LLTextValidate::validateInt); } params.follows.flags(FOLLOWS_LEFT | FOLLOWS_BOTTOM); diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 8d91aa2284..574b24cf13 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1616,9 +1616,6 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para while ( LLUrlRegistry::instance().findUrl(text, match, boost::bind(&LLTextBase::replaceUrlLabel, this, _1, _2)) ) { - - LLTextUtil::processUrlMatch(&match,this); - start = match.getStart(); end = match.getEnd()+1; @@ -1643,6 +1640,10 @@ void LLTextBase::appendTextImpl(const std::string &new_text, const LLStyle::Para std::string subtext=text.substr(0,start); appendAndHighlightText(subtext, part, style_params); } + + // inserts an avatar icon preceding the Url if appropriate + LLTextUtil::processUrlMatch(&match,this); + // output the styled Url (unless we've been asked to suppress hyperlinking) if (match.isLinkDisabled()) { |