diff options
| author | Cinder Biscuits <cinder@alchemyviewer.org> | 2015-02-26 14:55:50 -0700 |
|---|---|---|
| committer | Cinder Biscuits <cinder@alchemyviewer.org> | 2015-02-26 14:55:50 -0700 |
| commit | d9673d6c1d67ac104fc7872ea2da88560832dd28 (patch) | |
| tree | b2ab207152ee7b025eab69eed03733819bdf3d05 /indra/llui/llcombobox.cpp | |
| parent | 4665d35453f00fcccd6e17ea84d0549f62b07c5f (diff) | |
| parent | d4a2e9fd9a0e7001a6c824ddd6cf37039a632b9d (diff) | |
Merged lindenlab/viewer-tools-update into default
Diffstat (limited to 'indra/llui/llcombobox.cpp')
| -rwxr-xr-x | indra/llui/llcombobox.cpp | 5 |
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 |