summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorcallum <none@none>2010-12-03 11:55:08 -0800
committercallum <none@none>2010-12-03 11:55:08 -0800
commit6ec12a2cd9bc7ba6a8d8451fd8eb86ba43b2cd8c (patch)
treed8ef6121c4d018de65bc06f70f92cec4d402d3d9 /indra/llui
parent1c946e8e4dcb6a6fcdfafeca82d9ba1db9f09e54 (diff)
parent2491555272283340206f3532b9417ec07df40022 (diff)
Merge after pull from viewer-development
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llcombobox.cpp2
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();
}