diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-12-10 13:20:10 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-12-10 13:20:10 -0800 |
| commit | 647fe8fb13c02854349fda2113bc9b1902ceca10 (patch) | |
| tree | 662e864d65fe3e0bed4615706121cc8a38e2e8c5 /indra/llui/llcombobox.cpp | |
| parent | 1924f1bbca437eac4ca5d047c489042e65904d2e (diff) | |
| parent | 426744df2c9a6c04bab594fefbd8b35970d0948d (diff) | |
Merge
Diffstat (limited to 'indra/llui/llcombobox.cpp')
| -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(); } |