diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-07 14:56:36 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-07 14:56:36 -0500 |
| commit | 6a59861bde42e1b8ddc8c19a0b37a2b0a7011f7a (patch) | |
| tree | 7a6d04e723a71c33205cdfa9815006d45310657c /indra/llui/llscrolllistctrl.cpp | |
| parent | 6a0c02c1b1e6ea3d84f06f2ab58402a98eece462 (diff) | |
| parent | d9b4570883652d647c05083c18fac1a088efd6e2 (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
| -rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 7df7c13dc0..8854f0a02e 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -1482,8 +1482,9 @@ void LLScrollListCtrl::draw() // Draw background if (mBackgroundVisible) { + F32 alpha = getCurrentTransparency(); gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); - gl_rect_2d(background, getEnabled() ? mBgWriteableColor.get() : mBgReadOnlyColor.get() ); + gl_rect_2d(background, getEnabled() ? mBgWriteableColor.get() % alpha : mBgReadOnlyColor.get() % alpha ); } if (mColumnsDirty) |