diff options
author | angela <angela@lindenlab.com> | 2009-11-12 21:17:31 +0800 |
---|---|---|
committer | angela <angela@lindenlab.com> | 2009-11-12 21:17:31 +0800 |
commit | b1a81afef6395e136f26e296311ec9b57eef260e (patch) | |
tree | a20f0d5f917fe6003d84d3ddb2db17e63b9677c7 /indra/llui/lltextbase.cpp | |
parent | d1f8328b1e3bc17b920dfc3f8bc1865dff19d039 (diff) |
add optional style params in setText function
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 8d36c9c616..49bd3a2a19 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1445,7 +1445,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); @@ -1460,7 +1460,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()); } |