diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-08-02 15:07:35 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-08-02 15:07:35 -0700 |
| commit | 0b81c19cbe809f041e628da334c305ea33fae2e9 (patch) | |
| tree | 57a870cb47928bb996c33d2111a0f49c3f28b31f /indra/llui | |
| parent | 8d081d34fc56fd1b742045dd120b6acbda0d027e (diff) | |
| parent | 6d9158dcaddfe486d91a514c9df92c155f655397 (diff) | |
Pull from richard/viewer-experience
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llcombobox.cpp | 6 | ||||
| -rw-r--r-- | indra/llui/llfloater.cpp | 3 | ||||
| -rw-r--r-- | indra/llui/llfloaterreg.cpp | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index a4d1854bc8..cddda03faf 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -791,8 +791,10 @@ BOOL LLComboBox::handleKeyHere(KEY key, MASK mask) return FALSE; } // if selection has changed, pop open list - else if (mList->getLastSelectedItem() != last_selected_item || - (key == KEY_DOWN || key == KEY_UP) && !mList->isEmpty()) + else if (mList->getLastSelectedItem() != last_selected_item + || ((key == KEY_DOWN || key == KEY_UP) + && mList->getCanSelect() + && !mList->isEmpty())) { showList(); } diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 43a37d6dff..8917d5490c 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -3107,4 +3107,5 @@ void LLFloater::stackWith(LLFloater& other) mRectControl.clear(); // don't save rect of stacked floaters setShape(next_rect); -}
\ No newline at end of file +} + diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index 1463d0bfbb..fc7dcfcc4e 100644 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -214,7 +214,7 @@ LLFloater* LLFloaterReg::showInstance(const std::string& name, const LLSD& key, LLFloater* instance = getInstance(name, key); if (instance) { - instance->openFloater(instance->mKey); + instance->openFloater(key); if (focus) instance->setFocus(TRUE); } |