diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-19 09:28:35 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-19 09:28:35 -0800 |
| commit | 51e640e5d753ac9dc005cd6827db77988a04b8fa (patch) | |
| tree | 85cb5fc6626626b42df6a425a0663a515ac5362c /indra/llui/lltextbox.h | |
| parent | d4ba73ed721fa0811474fc53300f560539d38018 (diff) | |
| parent | 3e46ee6274d04d91657da92953b167fe94eb7f59 (diff) | |
Merge from remote repo
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; } |