summaryrefslogtreecommitdiff
path: root/indra/llui/llcheckboxctrl.h
diff options
context:
space:
mode:
authorBill Curtis <bill.curtis@gmail.com>2010-11-19 14:11:42 -0800
committerBill Curtis <bill.curtis@gmail.com>2010-11-19 14:11:42 -0800
commit066d8c39cae11d25dcf72f98bfccd4339973ed42 (patch)
tree8debcaecdd87271f618daeb8500e7032968c5202 /indra/llui/llcheckboxctrl.h
parentcb8b30864f08947a23379eabcac63c2ceee62f7c (diff)
parent3337ef16cee97e26b45aa07518d34d031bdc75fa (diff)
Automated merge with file:///Users/Bill/Projects/viewer-release
Diffstat (limited to 'indra/llui/llcheckboxctrl.h')
-rw-r--r--indra/llui/llcheckboxctrl.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llui/llcheckboxctrl.h b/indra/llui/llcheckboxctrl.h
index 0147088280..67d8091a97 100644
--- a/indra/llui/llcheckboxctrl.h
+++ b/indra/llui/llcheckboxctrl.h
@@ -52,8 +52,6 @@ public:
struct Params
: public LLInitParam::Block<Params, LLUICtrl::Params>
{
- Optional<LLUIColor> text_enabled_color;
- Optional<LLUIColor> text_disabled_color;
Optional<bool> initial_value; // override LLUICtrl initial_value
Optional<LLTextBox::Params> label_text;