diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-22 09:36:12 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-22 09:36:12 -0800 |
| commit | 7365ee2d9d79813b6f515d333b63210d583038b5 (patch) | |
| tree | bd237c8141a0b5643038640f4bc24d1fb6d5fd65 /indra/llui/llscrollcontainer.cpp | |
| parent | 049b00a6f10d50609055810b0800f49476b351d2 (diff) | |
| parent | ab100825bd0064dc64b9ef8bea1c70bc04090716 (diff) | |
merge
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. |