summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbox.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-08-24 18:37:53 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-08-24 18:37:53 +0100
commit6ba23344c95157793af9e4154933ae8df61630e8 (patch)
treee12956cbe7a0082bbaaa545cb80d9e86b13f88e8 /indra/llui/lltextbox.h
parent01d06a3572c533f810f8f42e7ae9c55051f34aaf (diff)
parent46e6135eef90b7ff0f08b12384a9aafc1a3e91e1 (diff)
merge heads. whew.
Diffstat (limited to 'indra/llui/lltextbox.h')
-rw-r--r--indra/llui/lltextbox.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/lltextbox.h b/indra/llui/lltextbox.h
index 4634dd0ff2..071e18c638 100644
--- a/indra/llui/lltextbox.h
+++ b/indra/llui/lltextbox.h
@@ -52,6 +52,8 @@ public:
/*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask);
/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
+ /*virtual*/ void setEnabled(BOOL enabled);
+
/*virtual*/ void setText( const LLStringExplicit& text, const LLStyle::Params& input_params = LLStyle::Params() );
void setRightAlign() { mHAlign = LLFontGL::RIGHT; }