diff options
| author | Richard Linden <none@none> | 2011-07-29 17:29:02 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-07-29 17:29:02 -0700 |
| commit | c7a2f5c4fba4ec8a782f96aa379b1372ed31a317 (patch) | |
| tree | 201d685d02a38f810afc65b8d35face48a8f8496 /indra/llui/llcombobox.cpp | |
| parent | feddda6740f55c5e872be4b608d516e86e0c4182 (diff) | |
EXP-1057 FIX Cursor doesn't go to the input field on the Find Floater due to lack of window focus
also allow right clip to copy url from disabled address bar
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(); } |