diff options
author | Jacek Antonelli | 2008-08-15 23:45:07 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:07 -0500 |
commit | 8465910c79b8e746e04fd581cca2d60399e569b9 (patch) | |
tree | f43fec3e83c46e0d6190dca923d6fb268b52ffdd /linden/indra/llui/llbutton.cpp | |
parent | Second Life viewer sources 1.18.2.1 (diff) | |
download | meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.zip meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.gz meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.bz2 meta-impy-8465910c79b8e746e04fd581cca2d60399e569b9.tar.xz |
Second Life viewer sources 1.18.3.2-RC
Diffstat (limited to 'linden/indra/llui/llbutton.cpp')
-rw-r--r-- | linden/indra/llui/llbutton.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp index aa50a6e..6ed6885 100644 --- a/linden/indra/llui/llbutton.cpp +++ b/linden/indra/llui/llbutton.cpp | |||
@@ -89,8 +89,7 @@ LLButton::LLButton( const LLString& name, const LLRect& rect, const LLString& co | |||
89 | mCurGlowStrength(0.f), | 89 | mCurGlowStrength(0.f), |
90 | mNeedsHighlight(FALSE), | 90 | mNeedsHighlight(FALSE), |
91 | mCommitOnReturn(TRUE), | 91 | mCommitOnReturn(TRUE), |
92 | mImagep( NULL ), | 92 | mImagep( NULL ) |
93 | mIsDirty( FALSE ) | ||
94 | { | 93 | { |
95 | mUnselectedLabel = name; | 94 | mUnselectedLabel = name; |
96 | mSelectedLabel = name; | 95 | mSelectedLabel = name; |
@@ -275,8 +274,6 @@ void LLButton::onCommit() | |||
275 | { | 274 | { |
276 | (*mClickedCallback)( mCallbackUserData ); | 275 | (*mClickedCallback)( mCallbackUserData ); |
277 | } | 276 | } |
278 | |||
279 | mIsDirty = TRUE; | ||
280 | } | 277 | } |
281 | 278 | ||
282 | 279 | ||
@@ -291,7 +288,6 @@ BOOL LLButton::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent) | |||
291 | (*mClickedCallback)( mCallbackUserData ); | 288 | (*mClickedCallback)( mCallbackUserData ); |
292 | } | 289 | } |
293 | handled = TRUE; | 290 | handled = TRUE; |
294 | mIsDirty = TRUE; | ||
295 | } | 291 | } |
296 | return handled; | 292 | return handled; |
297 | } | 293 | } |
@@ -308,7 +304,6 @@ BOOL LLButton::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent ) | |||
308 | (*mClickedCallback)( mCallbackUserData ); | 304 | (*mClickedCallback)( mCallbackUserData ); |
309 | } | 305 | } |
310 | handled = TRUE; | 306 | handled = TRUE; |
311 | mIsDirty = TRUE; | ||
312 | } | 307 | } |
313 | } | 308 | } |
314 | return handled; | 309 | return handled; |
@@ -368,9 +363,7 @@ BOOL LLButton::handleMouseUp(S32 x, S32 y, MASK mask) | |||
368 | if (mClickedCallback) | 363 | if (mClickedCallback) |
369 | { | 364 | { |
370 | (*mClickedCallback)( mCallbackUserData ); | 365 | (*mClickedCallback)( mCallbackUserData ); |
371 | } | 366 | } |
372 | |||
373 | mIsDirty = TRUE; | ||
374 | } | 367 | } |
375 | 368 | ||
376 | mMouseDownTimer.stop(); | 369 | mMouseDownTimer.stop(); |
@@ -773,7 +766,6 @@ void LLButton::setToggleState(BOOL b) | |||
773 | void LLButton::setValue(const LLSD& value ) | 766 | void LLButton::setValue(const LLSD& value ) |
774 | { | 767 | { |
775 | mToggleState = value.asBoolean(); | 768 | mToggleState = value.asBoolean(); |
776 | mIsDirty = FALSE; | ||
777 | } | 769 | } |
778 | 770 | ||
779 | LLSD LLButton::getValue() const | 771 | LLSD LLButton::getValue() const |