diff options
| author | angela <angela@lindenlab.com> | 2009-11-12 21:36:49 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-12 21:36:49 +0800 |
| commit | f9646bd759f87012fcf59c9ca5822490ec196666 (patch) | |
| tree | 228572fc26e369f6208f8a00f7f08a63829f3520 /indra/llui/lltextbase.cpp | |
| parent | 95adfa4cacb68e21b7251882feffbc7cb50b4438 (diff) | |
| parent | ff09b049a7916a73301bd02f9810994025d88e06 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 9706878a57..7b1aaac35c 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1451,7 +1451,7 @@ void LLTextBase::createUrlContextMenu(S32 x, S32 y, const std::string &in_url) } } -void LLTextBase::setText(const LLStringExplicit &utf8str) +void LLTextBase::setText(const LLStringExplicit &utf8str ,const LLStyle::Params& input_params) { // clear out the existing text and segments getViewModel()->setDisplay(LLWStringUtil::null); @@ -1466,7 +1466,7 @@ void LLTextBase::setText(const LLStringExplicit &utf8str) std::string text(utf8str); LLStringUtil::removeCRLF(text); - appendText(text, false); + appendText(text, false, input_params); onValueChange(0, getLength()); } |