diff options
author | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
---|---|---|
committer | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
commit | ce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch) | |
tree | 3388e6f8ff02292ec4521d278c841801462945b8 /indra/llui/llcheckboxctrl.h | |
parent | b699ae454d8477d19342d320758cd993d1d28cec (diff) |
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/llui/llcheckboxctrl.h')
-rw-r--r-- | indra/llui/llcheckboxctrl.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llcheckboxctrl.h b/indra/llui/llcheckboxctrl.h index 76b197125d..3b1883ce8d 100644 --- a/indra/llui/llcheckboxctrl.h +++ b/indra/llui/llcheckboxctrl.h @@ -90,7 +90,8 @@ public: static void onButtonPress(void *userdata); - virtual BOOL isDirty(); // Returns TRUE if the user has modified this control. + virtual BOOL isDirty() const; // Returns TRUE if the user has modified this control. + virtual void resetDirty(); // Clear dirty state protected: // note: value is stored in toggle state of button @@ -100,7 +101,8 @@ protected: LLColor4 mTextEnabledColor; LLColor4 mTextDisabledColor; BOOL mRadioStyle; - BOOL mInitialValue; + BOOL mInitialValue; // Value set in constructor + BOOL mSetValue; // Value set programmatically BOOL mKeyboardFocusOnClick; LLViewBorder* mBorder; }; |