diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-26 01:22:23 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-26 01:22:23 +0000 |
| commit | 9746cf5310871f305a1419163c5adfbed3f1534b (patch) | |
| tree | d1f1d278927683fe837173318cc0da1e3c2f8ca4 /indra/llui/llbutton.cpp | |
| parent | 4284da17878eb9f8ade673d172148d34887aa816 (diff) | |
EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release
This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392
ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release
EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)
Diffstat (limited to 'indra/llui/llbutton.cpp')
| -rw-r--r-- | indra/llui/llbutton.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index d28cf96fa0..d93748d069 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -69,7 +69,8 @@ LLButton::LLButton( const LLString& name, const LLRect& rect, const LLString& co mCurGlowStrength(0.f), mNeedsHighlight(FALSE), mCommitOnReturn(TRUE), - mImagep( NULL ) + mImagep( NULL ), + mIsDirty( FALSE ) { mUnselectedLabel = name; mSelectedLabel = name; @@ -251,8 +252,12 @@ void LLButton::onCommit() { (*mClickedCallback)( mCallbackUserData ); } + + mIsDirty = TRUE; } + + BOOL LLButton::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent) { BOOL handled = FALSE; @@ -262,7 +267,8 @@ BOOL LLButton::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent) { (*mClickedCallback)( mCallbackUserData ); } - handled = TRUE; + handled = TRUE; + mIsDirty = TRUE; } return handled; } @@ -279,6 +285,7 @@ BOOL LLButton::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent ) (*mClickedCallback)( mCallbackUserData ); } handled = TRUE; + mIsDirty = TRUE; } } return handled; @@ -339,6 +346,8 @@ BOOL LLButton::handleMouseUp(S32 x, S32 y, MASK mask) { (*mClickedCallback)( mCallbackUserData ); } + + mIsDirty = TRUE; } mMouseDownTimer.stop(); @@ -741,6 +750,7 @@ void LLButton::setToggleState(BOOL b) void LLButton::setValue(const LLSD& value ) { mToggleState = value.asBoolean(); + mIsDirty = FALSE; } LLSD LLButton::getValue() const |