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/lltextbox.h | |
| parent | 95adfa4cacb68e21b7251882feffbc7cb50b4438 (diff) | |
| parent | ff09b049a7916a73301bd02f9810994025d88e06 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/llui/lltextbox.h')
| -rw-r--r-- | indra/llui/lltextbox.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltextbox.h b/indra/llui/lltextbox.h index 73f8a7c299..01b4bfa5ed 100644 --- a/indra/llui/lltextbox.h +++ b/indra/llui/lltextbox.h @@ -58,7 +58,7 @@ public: /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask); /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask); - /*virtual*/ void setText( const LLStringExplicit& text ); + /*virtual*/ void setText( const LLStringExplicit& text, const LLStyle::Params& input_params = LLStyle::Params() ); void setRightAlign() { mHAlign = LLFontGL::RIGHT; } void setHAlign( LLFontGL::HAlign align ) { mHAlign = align; } |