diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:32:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:32:12 -0500 |
| commit | b8a925ec71f2a4483476e363428c5656702b1f19 (patch) | |
| tree | 117c4b884d8fd1e79e8f64184e62ea453d82a990 /indra/llui/llscrollcontainer.cpp | |
| parent | 23031612745c7f1094a77252b24039333420b8c5 (diff) | |
| parent | 90a365ed2f13612d267a4eed9b54bd1b62edb7d5 (diff) | |
merge fix for STORM-584
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. |