summaryrefslogtreecommitdiff
path: root/indra/llui/llcombobox.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-12-03 14:49:33 -0500
committerLoren Shih <seraph@lindenlab.com>2010-12-03 14:49:33 -0500
commitf79615caced2cebb8e71b388b0dea45776b2f24b (patch)
tree44d7434cc5046976b03169bc74da71620c237a2b /indra/llui/llcombobox.cpp
parent4e922949a9a1e508a698ce5a03657f1417252d9f (diff)
parent2491555272283340206f3532b9417ec07df40022 (diff)
Automated merge up from viewer-development
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();
}