From 8c344f4da02105428c5933501d028a4a8908a657 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Tue, 9 Jan 2007 20:19:31 +0000 Subject: svn merge -r 56560:56599 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --- indra/llui/lllineeditor.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/llui/lllineeditor.h') diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h index 1df5dd88f7..ef2f43a1d3 100644 --- a/indra/llui/lllineeditor.h +++ b/indra/llui/lllineeditor.h @@ -127,9 +127,10 @@ public: void setSelection(S32 start, S32 end); void setCommitOnFocusLost( BOOL b ) { mCommitOnFocusLost = b; } + void setRevertOnEsc( BOOL b ) { mRevertOnEsc = b; } void setCursorColor(const LLColor4& c) { mCursorColor = c; } - const LLColor4& getCursorColor() const { return mCursorColor; } + const LLColor4& getCursorColor() const { return mCursorColor; } void setFgColor( const LLColor4& c ) { mFgColor = c; } void setReadOnlyFgColor( const LLColor4& c ) { mReadOnlyFgColor = c; } @@ -202,6 +203,7 @@ protected: protected: LLUIString mText; // The string being edited. + LLString mPrevText; // Saved string for 'ESC' revert LLUIString mLabel; // text label that is visible when no user text provided LLViewBorder* mBorder; @@ -217,6 +219,7 @@ protected: S32 mBorderRight; BOOL mCommitOnFocusLost; + BOOL mRevertOnEsc; void (*mKeystrokeCallback)( LLLineEditor* caller, void* userdata ); void (*mFocusLostCallback)( LLLineEditor* caller, void* userdata ); -- cgit v1.2.3