diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-08-02 15:07:35 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-08-02 15:07:35 -0700 |
| commit | 0b81c19cbe809f041e628da334c305ea33fae2e9 (patch) | |
| tree | 57a870cb47928bb996c33d2111a0f49c3f28b31f /indra/llui/llcombobox.cpp | |
| parent | 8d081d34fc56fd1b742045dd120b6acbda0d027e (diff) | |
| parent | 6d9158dcaddfe486d91a514c9df92c155f655397 (diff) | |
Pull from richard/viewer-experience
Diffstat (limited to 'indra/llui/llcombobox.cpp')
| -rw-r--r-- | indra/llui/llcombobox.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index a4d1854bc8..cddda03faf 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -791,8 +791,10 @@ 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) && !mList->isEmpty()) + else if (mList->getLastSelectedItem() != last_selected_item + || ((key == KEY_DOWN || key == KEY_UP) + && mList->getCanSelect() + && !mList->isEmpty())) { showList(); } |