diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-12-09 14:51:35 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-12-09 14:51:35 -0800 |
| commit | a1839ab425dd4c878d16b8705cfb62d3974b16d1 (patch) | |
| tree | f673f42b73eab50641dbfe7dc50b2a56fdd23881 /indra/llui | |
| parent | 88fb64283310cc02bb6f6f55d6b660fc4cd90d72 (diff) | |
| parent | 0308dbeda7645061e780db2bdb7dbdb0069faf67 (diff) | |
STORM-732, STORM-733, STORM-735, STORM-766, STORM-774 : pull into viewer-development
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfloater.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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); } } |