diff options
author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-17 17:50:06 +0200 |
---|---|---|
committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-17 17:50:06 +0200 |
commit | b0e984e58a10c6245a75f9bfd83f39d89e2d6369 (patch) | |
tree | 7ccc4e17b161ea9b14a6b5d10f5c412bcb957cfb /indra/newview/llexpandabletextbox.h | |
parent | 30f3397e35df30d444f17b00c43fb6135ddc0604 (diff) | |
parent | a332ec1608ec2444c82f140d3cbdb8d3bf659343 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llexpandabletextbox.h')
-rw-r--r-- | indra/newview/llexpandabletextbox.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llexpandabletextbox.h b/indra/newview/llexpandabletextbox.h index 7c989cfa50..2b4f9e527c 100644 --- a/indra/newview/llexpandabletextbox.h +++ b/indra/newview/llexpandabletextbox.h @@ -61,6 +61,7 @@ protected: // adds or removes "More" link as needed /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); /*virtual*/ void setText(const LLStringExplicit& text, const LLStyle::Params& input_params = LLStyle::Params()); + void setTextBase(const std::string& text) { LLTextBase::setText(text); } /** * Returns difference between text box height and text height. |