diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-17 15:25:34 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-17 15:25:34 -0500 |
| commit | 1f750b20665a5335d21c1989f875a4486af2964d (patch) | |
| tree | 690baba3c55f6edb58ba1a00cba4f37585c21977 /indra/newview/llexpandabletextbox.h | |
| parent | 967652a7059cd1434ec593d8d3022f8b8e6cf10c (diff) | |
| parent | de3c63c339e135f51a6075b9bf9dbca1398b4ac4 (diff) | |
pe -> viewer2.0 merge
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. |