From ce0a5fe14590b8d675b885fccd5f79d7ea17a302 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Tue, 21 Aug 2007 22:17:53 +0000
Subject: 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
---
 indra/llui/llbutton.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'indra/llui/llbutton.cpp')

diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index bdf1c12b79..2fe43c04f2 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -69,8 +69,7 @@ LLButton::LLButton(	const LLString& name, const LLRect& rect, const LLString& co
 	mCurGlowStrength(0.f),
 	mNeedsHighlight(FALSE),
 	mCommitOnReturn(TRUE),
-	mImagep( NULL ),
-	mIsDirty( FALSE )
+	mImagep( NULL )
 {
 	mUnselectedLabel = name;
 	mSelectedLabel = name;
@@ -255,8 +254,6 @@ void LLButton::onCommit()
 	{
 		(*mClickedCallback)( mCallbackUserData );
 	}
-
-	mIsDirty = TRUE;
 }
 
 
@@ -271,7 +268,6 @@ BOOL LLButton::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent)
 			(*mClickedCallback)( mCallbackUserData );
 		}
 		handled = TRUE;		
-		mIsDirty = TRUE;
 	}
 	return handled;	
 }
@@ -288,7 +284,6 @@ BOOL LLButton::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent )
 				(*mClickedCallback)( mCallbackUserData );
 			}
 			handled = TRUE;
-			mIsDirty = TRUE;
 		}
 	}
 	return handled;
@@ -348,9 +343,7 @@ BOOL LLButton::handleMouseUp(S32 x, S32 y, MASK mask)
 			if (mClickedCallback)
 			{
 				(*mClickedCallback)( mCallbackUserData );
-			}
-			
-			mIsDirty = TRUE;
+			}			
 		}
 
 		mMouseDownTimer.stop();
@@ -753,7 +746,6 @@ void LLButton::setToggleState(BOOL b)
 void LLButton::setValue(const LLSD& value )
 {
 	mToggleState = value.asBoolean();
-	mIsDirty = FALSE;
 }
 
 LLSD LLButton::getValue() const
-- 
cgit v1.2.3