diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-03 07:06:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-03 07:06:04 -0500 |
| commit | 67c01ab1fb1bfcb03c304946ccb2375f405187bf (patch) | |
| tree | ddb6bfd70f44aea70ccb33af4ec804319300f9a5 /indra/llui/llscrollcontainer.cpp | |
| parent | 039c0466f9759d7b966d8faf60945b3924d017a8 (diff) | |
| parent | b8a925ec71f2a4483476e363428c5656702b1f19 (diff) | |
merge up to new beta 1 candidate
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. |