From 9746cf5310871f305a1419163c5adfbed3f1534b Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Thu, 26 Jul 2007 01:22:23 +0000 Subject: 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) --- indra/llui/llbutton.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/llui/llbutton.h') diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h index 470c34fb64..ba77220a7b 100644 --- a/indra/llui/llbutton.h +++ b/indra/llui/llbutton.h @@ -80,6 +80,8 @@ public: // HACK: "committing" a button is the same as clicking on it. virtual void onCommit(); + virtual BOOL isDirty() { return mIsDirty; }; // Returns TRUE if the user has clicked on the button at all + void setUnselectedLabelColor( const LLColor4& c ) { mUnselectedLabelColor = c; } void setSelectedLabelColor( const LLColor4& c ) { mSelectedLabelColor = c; } @@ -256,6 +258,8 @@ protected: LLPointer mImagep; + BOOL mIsDirty; + static LLFrameTimer sFlashingTimer; }; -- cgit v1.2.3