summaryrefslogtreecommitdiff
path: root/indra/llui/llcombobox.cpp
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-04-28 12:03:31 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-04-28 12:03:31 +0300
commit89321a56fd95ade557be41a07e1b3deaa6162281 (patch)
tree0eee17609e3c72cdc5319f7ee9725214588baf72 /indra/llui/llcombobox.cpp
parentb2200f06dacfde4fe62a8f7f252e941c65d71c72 (diff)
parentfde0868231a25b8c9ce03a86cb53f1738d35688d (diff)
increment viewer version to 3.7.29
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 5b0f34aaa3..559895da1a 100755
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -789,6 +789,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