diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-12-09 21:05:39 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-12-09 21:05:39 -0800 |
| commit | c274f14520aa9883317ef5efd82a095176795637 (patch) | |
| tree | 7fe69dc7cf96bb66df7daca2f96d6ed39ba29ae6 /indra/llui | |
| parent | 6af32022cd9bc91584a5ae5cb6ff210f07b722fa (diff) | |
| parent | 91480065ca8bc1f023e41f5afbbc3c12b8463c3b (diff) | |
STORM-710 : Pull into viewer-development
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llcombobox.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index 70014fe4f5..6b06040b8a 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -769,7 +769,8 @@ BOOL LLComboBox::handleKeyHere(KEY key, MASK mask) return FALSE; } // if selection has changed, pop open list - else if ((mList->getLastSelectedItem() != last_selected_item) || (key == KEY_DOWN) || (key == KEY_UP)) + else if (mList->getLastSelectedItem() != last_selected_item || + (key == KEY_DOWN || key == KEY_UP) && !mList->isEmpty()) { showList(); } |