1 files changed, 9 insertions, 14 deletions

diff --git a/linden/indra/llui/llcheckboxctrl.cpp b/linden/indra/llui/llcheckboxctrl.cpp
index b184eda..ff46a80 100644
--- a/linden/indra/llui/llcheckboxctrl.cpp
+++ b/linden/indra/llui/llcheckboxctrl.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -75,7 +75,7 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const LLString& name, const LLRect& rect,
         }
 
         // must be big enough to hold all children
-        setSpanChildren(TRUE);
+        setUseBoundingRect(TRUE);
 
         mKeyboardFocusOnClick = TRUE;
 
@@ -130,6 +130,7 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const LLString& name, const LLRect& rect,
                 mButton->setDisabledImages( inactive_false_id, inactive_true_id );
                 mButton->setHoverGlowStrength(0.35f);
         }
+        mButton->setIsToggle(TRUE);
         mButton->setToggleState( initial_value );
         mButton->setFollowsLeft();
         mButton->setFollowsBottom();
@@ -150,16 +151,11 @@ void LLCheckBoxCtrl::onButtonPress( void *userdata )
 
         if (self->mRadioStyle)
         {
-                if (!self->getValue())
-                {
-                        self->setValue(TRUE);
-                }
-        }
-        else
-        {
-                self->toggle();
+                self->setValue(TRUE);
         }
+
         self->setControlValue(self->getValue());
+        // HACK: because buttons don't normally commit
         self->onCommit();
 
         if (self->mKeyboardFocusOnClick)
@@ -232,14 +228,13 @@ void LLCheckBoxCtrl::draw()
 //virtual
 void LLCheckBoxCtrl::setValue(const LLSD& value )
 {
-        mSetValue = value.asBoolean();
-        mButton->setToggleState( mSetValue );
+        mButton->setValue( value );
 }
 
 //virtual
 LLSD LLCheckBoxCtrl::getValue() const
 {
-        return mButton->getToggleState();
+        return mButton->getValue();
 }
 
 void LLCheckBoxCtrl::setLabel( const LLStringExplicit& label )