diff options
author | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:32:12 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:32:12 -0500 |
commit | b8a925ec71f2a4483476e363428c5656702b1f19 (patch) | |
tree | 117c4b884d8fd1e79e8f64184e62ea453d82a990 /indra/llui/llcombobox.cpp | |
parent | 23031612745c7f1094a77252b24039333420b8c5 (diff) | |
parent | 90a365ed2f13612d267a4eed9b54bd1b62edb7d5 (diff) |
merge fix for STORM-584
Diffstat (limited to 'indra/llui/llcombobox.cpp')
-rw-r--r-- | indra/llui/llcombobox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index a268ee5d75..70014fe4f5 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -769,7 +769,7 @@ BOOL LLComboBox::handleKeyHere(KEY key, MASK mask) return FALSE; } // if selection has changed, pop open list - else + else if ((mList->getLastSelectedItem() != last_selected_item) || (key == KEY_DOWN) || (key == KEY_UP)) { showList(); } |