summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistctrl.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-02 15:26:19 -0500
committerOz Linden <oz@lindenlab.com>2010-12-02 15:26:19 -0500
commitcc65a9dbe2a8570b3f392aacfb3a6ee1d76ee2be (patch)
tree9736a496da97c9a190da076f7311280d9864d638 /indra/llui/llscrolllistctrl.cpp
parentc51608633ddfdcf9a053fff37461059398ed4500 (diff)
parente1d31a5aca0e1619769735e6902b012bad965805 (diff)
merge up to latest beta
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
-rw-r--r--indra/llui/llscrolllistctrl.cpp3
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)