diff options
author | Oz Linden <oz@lindenlab.com> | 2010-12-14 14:47:01 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-12-14 14:47:01 -0500 |
commit | a0d3c7c0f8a5693a0ce3471142b8229578e9e948 (patch) | |
tree | c43e7f9b083079d3be6252a7c56c4618e6561273 /indra/newview/llscrollingpanelparam.cpp | |
parent | 31d401e1c3ccedfc06b9efda51923d050029cfc9 (diff) | |
parent | 7c0c86774f601cab3e0ca1598ea786b803c5bc71 (diff) |
merge fix for storm-401
Diffstat (limited to 'indra/newview/llscrollingpanelparam.cpp')
-rw-r--r-- | indra/newview/llscrollingpanelparam.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llscrollingpanelparam.cpp b/indra/newview/llscrollingpanelparam.cpp index 05b273cd29..f8c20dada0 100644 --- a/indra/newview/llscrollingpanelparam.cpp +++ b/indra/newview/llscrollingpanelparam.cpp @@ -165,12 +165,16 @@ void LLScrollingPanelParam::draw() getChildView("max param text")->setVisible( FALSE ); LLPanel::draw(); + // If we're in a focused floater, don't apply the floater's alpha to visual param hint, + // making its behavior similar to texture controls'. + F32 alpha = getTransparencyType() == TT_ACTIVE ? 1.0f : getCurrentTransparency(); + // Draw the hints over the "less" and "more" buttons. gGL.pushUIMatrix(); { const LLRect& r = mHintMin->getRect(); gGL.translateUI((F32)r.mLeft, (F32)r.mBottom, 0.f); - mHintMin->draw(); + mHintMin->draw(alpha); } gGL.popUIMatrix(); @@ -178,7 +182,7 @@ void LLScrollingPanelParam::draw() { const LLRect& r = mHintMax->getRect(); gGL.translateUI((F32)r.mLeft, (F32)r.mBottom, 0.f); - mHintMax->draw(); + mHintMax->draw(alpha); } gGL.popUIMatrix(); |