1 files changed, 17 insertions, 4 deletions

diff --git a/linden/indra/llui/llcheckboxctrl.cpp b/linden/indra/llui/llcheckboxctrl.cpp
index 24cf680..f49e220 100644
--- a/linden/indra/llui/llcheckboxctrl.cpp
+++ b/linden/indra/llui/llcheckboxctrl.cpp
@@ -59,7 +59,8 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const LLString& name, const LLRect& rect,
         mTextEnabledColor( LLUI::sColorsGroup->getColor( "LabelTextColor" ) ),
         mTextDisabledColor( LLUI::sColorsGroup->getColor( "LabelDisabledColor" ) ),
         mRadioStyle( use_radio_style ),
-        mInitialValue( initial_value )
+        mInitialValue( initial_value ),
+        mSetValue( initial_value )
 {
         if (font)
         {
@@ -228,7 +229,8 @@ void LLCheckBoxCtrl::draw()
 //virtual
 void LLCheckBoxCtrl::setValue(const LLSD& value )
 {
-        mButton->setToggleState( value.asBoolean() );
+        mSetValue = value.asBoolean();
+        mButton->setToggleState( mSetValue );
 }
 
 //virtual
@@ -269,16 +271,27 @@ void LLCheckBoxCtrl::setControlName(const LLString& control_name, LLView* contex
 
 
 // virtual              Returns TRUE if the user has modified this control.
-BOOL     LLCheckBoxCtrl::isDirty()
+BOOL     LLCheckBoxCtrl::isDirty() const
 {
         if ( mButton )
         {
-                return mButton->isDirty();
+                return (mSetValue != mButton->getToggleState());
         }
         return FALSE;           // Shouldn't get here
 }
 
 
+// virtual                      Clear dirty state
+void    LLCheckBoxCtrl::resetDirty()
+{
+        if ( mButton )
+        {
+                mSetValue = mButton->getToggleState();
+        }
+}
+
+
+
 // virtual
 LLXMLNodePtr LLCheckBoxCtrl::getXML(bool save_children) const
 {