diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-18 14:30:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-18 14:30:57 -0400 |
| commit | ed7785bf97a601448ba2da5fb2f19ea2861454c5 (patch) | |
| tree | 17e8d9ccf28ae30c5029ecea7e0ab8bed0fe3926 /indra/llui/llcheckboxctrl.cpp | |
| parent | c8533650b4779040c5e196f9ff156e3454edc9c8 (diff) | |
| parent | bf95c1cae7a84d1a97dacd8ea7f1b6af8be067a9 (diff) | |
merge up to 3.5.0-beta3 (chui)
Diffstat (limited to 'indra/llui/llcheckboxctrl.cpp')
| -rw-r--r-- | indra/llui/llcheckboxctrl.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/indra/llui/llcheckboxctrl.cpp b/indra/llui/llcheckboxctrl.cpp index 4fe444c1a4..5525520d78 100644 --- a/indra/llui/llcheckboxctrl.cpp +++ b/indra/llui/llcheckboxctrl.cpp @@ -107,7 +107,7 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const LLCheckBoxCtrl::Params& p) LLButton::Params params = p.check_button; params.rect(btn_rect); //params.control_name(p.control_name); - params.click_callback.function(boost::bind(&LLCheckBoxCtrl::onButtonPress, this, _2)); + params.click_callback.function(boost::bind(&LLCheckBoxCtrl::onCommit, this)); params.commit_on_return(false); // Checkboxes only allow boolean initial values, but buttons can // take any LLSD. @@ -123,18 +123,6 @@ LLCheckBoxCtrl::~LLCheckBoxCtrl() // Children all cleaned up by default view destructor. } - -// static -void LLCheckBoxCtrl::onButtonPress( const LLSD& data ) -{ - //if (mRadioStyle) - //{ - // setValue(TRUE); - //} - - onCommit(); -} - void LLCheckBoxCtrl::onCommit() { if( getEnabled() ) |