diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-12-20 11:21:17 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-20 11:21:17 -0800 |
| commit | dee57bea2526c84fb753abfd08e22c19f1cad21c (patch) | |
| tree | 7fbe9a8cbb5957b78a37eb13f58f8b6786ec8cac /indra/llui/llscrollcontainer.cpp | |
| parent | 67ca1c0b62cec74495104c0d78fc3743775bfd4e (diff) | |
| parent | 25eef545fd7f6513ae4c590126aef1dc06494f56 (diff) | |
Merge from viewer-development.
Diffstat (limited to 'indra/llui/llscrollcontainer.cpp')
| -rw-r--r-- | indra/llui/llscrollcontainer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp index 3146418a7d..380c477eb2 100644 --- a/indra/llui/llscrollcontainer.cpp +++ b/indra/llui/llscrollcontainer.cpp @@ -422,9 +422,10 @@ void LLScrollContainer::draw() // Draw background if( mIsOpaque ) { + F32 alpha = getCurrentTransparency(); + gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); - gGL.color4fv( mBackgroundColor.get().mV ); - gl_rect_2d( mInnerRect ); + gl_rect_2d(mInnerRect, mBackgroundColor.get() % alpha); } // Draw mScrolledViews and update scroll bars. |