From cccdd1fb397240fda99663b403e00b2582c202ba Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Fri, 30 Jan 2015 15:36:00 +0200
Subject: MAINT-4853 FIXED Pressing the ENTER key when entering a location into
 the Type a location field, doesn't log you in

---
 indra/llui/llcombobox.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/llui/llcombobox.cpp')

diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 56be52f69a..b32aea5ffa 100755
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -788,6 +788,11 @@ BOOL LLComboBox::handleKeyHere(KEY key, MASK mask)
 		// since the dropdown button eats the key
 		if (key == KEY_RETURN)
 		{
+			if (mask == MASK_NONE)
+			{
+				mOnReturnSignal(this, getValue());
+			}
+
 			// don't show list and don't eat key input when committing
 			// free-form text entry with RETURN since user already knows
             // what they are trying to select
-- 
cgit v1.2.3