diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:28:40 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:28:40 -0500 |
| commit | 90a365ed2f13612d267a4eed9b54bd1b62edb7d5 (patch) | |
| tree | 8e50ccd3db712740de388fa2a46b703a5c313567 /indra/llui/llscrolllistctrl.cpp | |
| parent | 7fedfda82504a8881b7d19d6c6f00fba849e615f (diff) | |
| parent | c1dbf70113274d543019778894f3e4017a174d7d (diff) | |
merge fix for STORM-673
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) |