summaryrefslogtreecommitdiff
path: root/indra/llui/llcombobox.cpp
diff options
context:
space:
mode:
authorAndrew Meadows <andrew@lindenlab.com>2010-12-22 09:54:45 -0800
committerAndrew Meadows <andrew@lindenlab.com>2010-12-22 09:54:45 -0800
commit740bd8dbfd791bdd548064912abad8c0bf230f4c (patch)
treebd237c8141a0b5643038640f4bc24d1fb6d5fd65 /indra/llui/llcombobox.cpp
parent049b00a6f10d50609055810b0800f49476b351d2 (diff)
parentab100825bd0064dc64b9ef8bea1c70bc04090716 (diff)
merge
Diffstat (limited to 'indra/llui/llcombobox.cpp')
-rw-r--r--indra/llui/llcombobox.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 2dabbc7767..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)
+ else if (mList->getLastSelectedItem() != last_selected_item ||
+ (key == KEY_DOWN || key == KEY_UP) && !mList->isEmpty())
{
showList();
}