svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134

1 files changed, 9 insertions, 4 deletions

diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index 7049de7b89..a2ce0d2c47 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -206,13 +206,13 @@ public:
 	void			setTabToNextField(BOOL b)				{ mTabToNextField = b; }
 	void			setCommitOnFocusLost(BOOL b)			{ mCommitOnFocusLost = b; }
 
-	// If takes focus, will take keyboard focus on click.
-	void			setTakesFocus(BOOL b)					{ mTakesFocus = b; }
-
 	// Hack to handle Notecards
 	virtual BOOL	importBuffer(const LLString& buffer );
 	virtual BOOL	exportBuffer(LLString& buffer );
 
+	// If takes focus, will take keyboard focus on click.
+	void			setTakesFocus(BOOL b)					{ mTakesFocus = b; }
+
 	void			setSourceID(const LLUUID& id) 			{ mSourceID = id; }
 	void 			setAcceptCallingCardNames(BOOL enable)	{ mAcceptCallingCardNames = enable; }
 
@@ -244,7 +244,10 @@ public:
 	void			startOfLine();
 	void			endOfLine();
 	void			endOfDoc();
-	
+
+	BOOL			isScrolledToTop();
+	BOOL			isScrolledToBottom();
+
 	// Getters
 	const LLWString& getWText() const;
 	llwchar			getWChar(S32 pos);
@@ -439,6 +442,8 @@ protected:
 	BOOL			mTakesFocus;
 	BOOL			mHideScrollbarForShortDocs;
 	BOOL			mTakesNonScrollClicks;
+	BOOL			mTrackBottom;			// if true, keeps scroll position at bottom during resize
+	BOOL			mScrolledToBottom;
 
 	BOOL			mAllowEmbeddedItems;