merge changes for 3.8.5-release

1 files changed, 13 insertions, 0 deletions

diff --git a/indra/llui/llsearcheditor.cpp b/indra/llui/llsearcheditor.cpp
index ea96fc573d..1fdd05a11c 100755
--- a/indra/llui/llsearcheditor.cpp
+++ b/indra/llui/llsearcheditor.cpp
@@ -29,6 +29,7 @@
 #include "linden_common.h"
  
 #include "llsearcheditor.h"
+#include "llkeyboard.h"
 
 LLSearchEditor::LLSearchEditor(const LLSearchEditor::Params& p)
 :	LLUICtrl(p),
@@ -166,4 +167,16 @@ void LLSearchEditor::handleKeystroke()
 	{
 		mKeystrokeCallback(this, getValue());
 	}
+
+	KEY key = gKeyboard->currentKey();
+	if (key == KEY_LEFT ||
+		key == KEY_RIGHT)
+	{
+			return;
+	}
+
+	if (mTextChangedCallback)
+	{
+		mTextChangedCallback(this, getValue());
+	}
 }