diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:27:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:27:20 -0500 |
| commit | c1dbf70113274d543019778894f3e4017a174d7d (patch) | |
| tree | 13dee618db9156f6a24ec8f580fc60bb834be208 /indra/llui/llscrollcontainer.cpp | |
| parent | 673b3f0502fdfd4deb6f15b3fc9cba198bd326d9 (diff) | |
| parent | cc65a9dbe2a8570b3f392aacfb3a6ee1d76ee2be (diff) | |
merge fix for STORM-718
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. |