merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3

Fixes: EXT-839 EXT-859 EXT-868 EXT-795 EXT-861 EXT-678 EXT-848 EXT-873

1 files changed, 6 insertions, 9 deletions

diff --git a/indra/newview/llsearchcombobox.cpp b/indra/newview/llsearchcombobox.cpp
index c903f40f3f..29d31e8b56 100644
--- a/indra/newview/llsearchcombobox.cpp
+++ b/indra/newview/llsearchcombobox.cpp
@@ -152,19 +152,16 @@ void LLSearchComboBox::onSelectionCommit()
 {
 	std::string search_query = getSimple();
 	LLStringUtil::trim(search_query);
-	if(search_query.empty())
-	{
-		mTextEntry->setText(search_query);
-		setControlValue(search_query);
-
-		return;
-	}
 
-	remove(search_query);
-	add(search_query, ADD_TOP);
 	mTextEntry->setText(search_query);
 	setControlValue(search_query);
 
+	if(!search_query.empty())
+	{
+		remove(search_query);
+		add(search_query, ADD_TOP);
+	}
+
 	LLUICtrl::onCommit();
 }