summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbox.h
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2009-11-13 08:43:56 +0800
committerangela <angela@lindenlab.com>2009-11-13 08:43:56 +0800
commit0d4ccb9d1c0761864c8b0c19f0bdd1700b425837 (patch)
tree717db44548966f400b3d2cfb84817b01761f70b7 /indra/llui/lltextbox.h
parentfd9257a5f2649d7afbf65067c0fa4653fc81272c (diff)
parentb4a3b65a602ad56baf761a8426093eda585bc572 (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.h2
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; }