From 2c6af0629c5563117d5a11f16f2e9b5bace05b90 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 6 Jan 2015 10:04:52 +0100
Subject: [PATCH] FIRE-15334: Pressing <Return> in chat bar when text is
 selected can result in text being deleted before send

---
 indra/llui/llchatentry.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/indra/llui/llchatentry.cpp b/indra/llui/llchatentry.cpp
index 698f3d5e3f..0a4e4dda98 100755
--- a/indra/llui/llchatentry.cpp
+++ b/indra/llui/llchatentry.cpp
@@ -190,8 +190,11 @@ BOOL LLChatEntry::handleSpecialKey(const KEY key, const MASK mask)
     if (key == KEY_RETURN)
     {
         endOfDoc();
-        startSelection();
-        endSelection();
+		// <FS:Ansariel> FIRE-15334: Properly deselect
+        //startSelection();
+        //endSelection();
+		deselect();
+		// </FS:Ansariel>
     }
 
 	LLTextEditor::handleSpecialKey(key, mask);