summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2010-12-07 13:45:29 +0200
committerVadim ProductEngine <vsavchuk@productengine.com>2010-12-07 13:45:29 +0200
commit2b70e8e0017846b174baaaea0ca1ca63e871eaba (patch)
tree73b40b40dbabade09b86efc606f5572572d1cb19
parent81313cb3047b215df8f6e4c053a2a656274a8983 (diff)
STORM-733 FIXED Build Tools floater now has inactive floater transparency when opened (because it's not focused by default).
-rw-r--r--indra/llui/llfloater.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index e79e280b20..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
@@ -1463,8 +1464,8 @@ void LLFloater::setFrontmost(BOOL take_focus)
// so we need to query our parent directly
((LLFloaterView*)getParent())->bringToFront(this, take_focus);
- // Make sure we use the active floater transparency settings (STORM-732).
- updateTransparency(TT_ACTIVE);
+ // Make sure to set the appropriate transparency type (STORM-732).
+ updateTransparency(hasFocus() || getIsChrome() ? TT_ACTIVE : TT_INACTIVE);
}
}