diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-01-06 16:38:19 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-01-06 16:38:19 -0800 |
| commit | 35bb14951f686da538264db349f4bfbe045b8c82 (patch) | |
| tree | 31d37e3e67863aba03b2c6aef5abc5629a784e65 /indra/llui/llcheckboxctrl.cpp | |
| parent | 95f14d73138a4f0eb9163fdc560a0dcad9564c4c (diff) | |
| parent | e28eac929b8d26d133be5c1953cfdd0b7d0eb9e5 (diff) | |
Merge
Diffstat (limited to 'indra/llui/llcheckboxctrl.cpp')
| -rw-r--r-- | indra/llui/llcheckboxctrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llcheckboxctrl.cpp b/indra/llui/llcheckboxctrl.cpp index cd10dfdb1c..3d32157406 100644 --- a/indra/llui/llcheckboxctrl.cpp +++ b/indra/llui/llcheckboxctrl.cpp @@ -107,8 +107,8 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const LLCheckBoxCtrl::Params& p) { tbparams.font(p.font); } + tbparams.text_color( p.enabled() ? p.text_enabled_color() : p.text_disabled_color() ); mLabel = LLUICtrlFactory::create<LLTextBox> (tbparams); - addChild(mLabel); // Button |