summaryrefslogtreecommitdiff
path: root/indra/llui/llcombobox.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-02 15:28:40 -0500
committerOz Linden <oz@lindenlab.com>2010-12-02 15:28:40 -0500
commit90a365ed2f13612d267a4eed9b54bd1b62edb7d5 (patch)
tree8e50ccd3db712740de388fa2a46b703a5c313567 /indra/llui/llcombobox.cpp
parent7fedfda82504a8881b7d19d6c6f00fba849e615f (diff)
parentc1dbf70113274d543019778894f3e4017a174d7d (diff)
merge fix for STORM-673
Diffstat (limited to 'indra/llui/llcombobox.cpp')
-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();
}