diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-13 10:52:14 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-13 10:52:14 -0700 |
| commit | b3f2339cd712adcb9873de829bd863fcba247eff (patch) | |
| tree | 367b39531bd7ef660557784f8a2b8fd8c91d388e /indra/llui/llbutton.cpp | |
| parent | 084169645a7e7d9228ef5fa9b0547cbf26510eef (diff) | |
| parent | 211ad465bf97dd0c9c858671be94d397fbfaf67b (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/llbutton.cpp')
| -rw-r--r-- | indra/llui/llbutton.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index f40d99c024..3572d18860 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -1189,7 +1189,7 @@ void LLButton::setFloaterToggle(LLUICtrl* ctrl, const LLSD& sdname) // Set the button control value (toggle state) to the floater visibility control (Sets the value as well) button->setControlVariable(LLFloater::getControlGroup()->getControl(vis_control_name)); // Set the clicked callback to toggle the floater - button->setClickedCallback(boost::bind(&LLFloaterReg::toggleFloaterInstance, sdname)); + button->setClickedCallback(boost::bind(&LLFloaterReg::toggleInstance, sdname, LLSD())); } // static |
