diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-12-10 13:22:55 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-10 13:22:55 -0800 |
| commit | e27bcbe0d20c87556b0bcb1e3feaaea6544d3e16 (patch) | |
| tree | 910dbc7db40ddae4c66ad24e9b25346771500a75 /indra/llui | |
| parent | 95445fb1b56a60145933db0891133230c87274b8 (diff) | |
| parent | 426744df2c9a6c04bab594fefbd8b35970d0948d (diff) | |
Merge from viewer-development
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llcombobox.cpp | 3 | ||||
| -rw-r--r-- | indra/llui/llfloater.cpp | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index 70014fe4f5..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) || (key == KEY_DOWN) || (key == KEY_UP)) + else if (mList->getLastSelectedItem() != last_selected_item || + (key == KEY_DOWN || key == KEY_UP) && !mList->isEmpty()) { showList(); } diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 7727e154da..1265733bf5 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1,4 +1,5 @@ /** + * @file llfloater.cpp * @brief LLFloater base class * @@ -1189,7 +1190,7 @@ void LLFloater::setFocus( BOOL b ) last_focus->setFocus(TRUE); } } - updateTransparency(this, b ? TT_ACTIVE : TT_INACTIVE); + updateTransparency(b ? TT_ACTIVE : TT_INACTIVE); } // virtual @@ -1462,6 +1463,9 @@ void LLFloater::setFrontmost(BOOL take_focus) // there are more than one floater view // so we need to query our parent directly ((LLFloaterView*)getParent())->bringToFront(this, take_focus); + + // Make sure to set the appropriate transparency type (STORM-732). + updateTransparency(hasFocus() || getIsChrome() ? TT_ACTIVE : TT_INACTIVE); } } |