2 files changed, 33 insertions, 1 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 7150052b65..81a87b8cdc 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -263,7 +263,9 @@ LLTextEditor::LLTextEditor(const LLTextEditor::Params& p) :
 	mShowEmojiHelper(p.show_emoji_helper),
 	mEnableTooltipPaste(p.enable_tooltip_paste),
 	mPassDelete(FALSE),
-	mKeepSelectionOnReturn(false)
+	mKeepSelectionOnReturn(false),
+    mSelectAllOnFocusReceived(false),
+    mSelectedOnFocusReceived(false)
 {
 	mSourceID.generate();
 
@@ -385,6 +387,7 @@ void LLTextEditor::selectNext(const std::string& search_text_in, BOOL case_insen
 	setCursorPos(loc);
 	
 	mIsSelecting = TRUE;
+    mSelectedOnFocusReceived = false;
 	mSelectionEnd = mCursorPos;
 	mSelectionStart = llmin((S32)getLength(), (S32)(mCursorPos + search_text.size()));
 }
@@ -664,6 +667,13 @@ BOOL LLTextEditor::canSelectAll() const
 	return TRUE;
 }
 
+//virtual
+void LLTextEditor::deselect()
+{
+    LLTextBase::deselect();
+    mSelectedOnFocusReceived = false;
+}
+
 // virtual
 void LLTextEditor::selectAll()
 {
@@ -681,6 +691,11 @@ void LLTextEditor::selectByCursorPosition(S32 prev_cursor_pos, S32 next_cursor_p
 	endSelection();
 }
 
+void LLTextEditor::setSelectAllOnFocusReceived(bool b)
+{
+    mSelectAllOnFocusReceived = b;
+}
+
 void LLTextEditor::insertEmoji(llwchar emoji)
 {
 	LL_INFOS() << "LLTextEditor::insertEmoji(" << wchar_utf8_preview(emoji) << ")" << LL_ENDL;
@@ -758,8 +773,16 @@ BOOL LLTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
 	// Delay cursor flashing
 	resetCursorBlink();
 
+    mSelectedOnFocusReceived = false;
 	if (handled && !gFocusMgr.getMouseCapture())
 	{
+        if (!mask && mSelectAllOnFocusReceived)
+        {
+            mIsSelecting = false;
+            mSelectionStart = getLength();
+            mSelectionEnd = 0;
+            mSelectedOnFocusReceived = true;
+        }
 		gFocusMgr.setMouseCapture( this );
 	}
 	return handled;
@@ -2114,6 +2137,11 @@ void LLTextEditor::focusLostHelper()
 		gEditMenuHandler = NULL;
 	}
 
+    if (mSelectedOnFocusReceived)
+    {
+        deselect();
+    }
+
 	if (mCommitOnFocusLost)
 	{
 		onCommit();
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index 521405ec25..a4eec8874f 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -142,8 +142,10 @@ public:
 	virtual BOOL	canDoDelete() const;
 	virtual void	selectAll();
 	virtual BOOL	canSelectAll()	const;
+    virtual void	deselect();
 
 	void 			selectByCursorPosition(S32 prev_cursor_pos, S32 next_cursor_pos);
+    void 			setSelectAllOnFocusReceived(bool b);
 
 	virtual bool	canLoadOrSaveToFile();
 
@@ -331,6 +333,8 @@ private:
 	bool			mEnableTooltipPaste;
 	bool			mPassDelete;
 	bool			mKeepSelectionOnReturn;	// disabling of removing selected text after pressing of Enter
+    bool			mSelectAllOnFocusReceived;
+    bool			mSelectedOnFocusReceived;
 
 	LLUUID			mSourceID;