summaryrefslogtreecommitdiff
path: root/indra/llui/llcombobox.cpp
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-01-30 15:36:00 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-01-30 15:36:00 +0200
commitcccdd1fb397240fda99663b403e00b2582c202ba (patch)
treedf59513302ac4dcd4812ccdc65731bc7b53687b3 /indra/llui/llcombobox.cpp
parent38000f8f18cc4b46c243edcc372b2cfa89cf3bb8 (diff)
MAINT-4853 FIXED Pressing the ENTER key when entering a location into the Type a location field, doesn't log you in
Diffstat (limited to 'indra/llui/llcombobox.cpp')
-rwxr-xr-xindra/llui/llcombobox.cpp5
1 files changed, 5 insertions, 0 deletions
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