diff options
author | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:28:40 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:28:40 -0500 |
commit | 90a365ed2f13612d267a4eed9b54bd1b62edb7d5 (patch) | |
tree | 8e50ccd3db712740de388fa2a46b703a5c313567 /indra/llui/llscrollcontainer.cpp | |
parent | 7fedfda82504a8881b7d19d6c6f00fba849e615f (diff) | |
parent | c1dbf70113274d543019778894f3e4017a174d7d (diff) |
merge fix for STORM-673
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. |