summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistctrl.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-02-17 17:02:26 -0800
committerRichard Linden <none@none>2010-02-17 17:02:26 -0800
commitcf52fc85ae4d06335a09b4dd60bddeb7f66841b3 (patch)
treeafa95f76e9ef3ebe9b91dce90d2a8671f28ab435 /indra/llui/llscrolllistctrl.cpp
parent7c86d4434822d7a3172bed82c3812032089c1518 (diff)
parent9dfff8c6d2a54e3f6e069c26cc8753dc9331aec1 (diff)
merge
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
-rw-r--r--indra/llui/llscrolllistctrl.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 478e270c98..ac4811210b 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -1388,6 +1388,8 @@ void LLScrollListCtrl::drawItems()
LLGLSUIDefault gls_ui;
+ F32 alpha = getDrawContext().mAlpha;
+
{
LLLocalClipRect clip(mItemListRect);
@@ -1463,7 +1465,7 @@ void LLScrollListCtrl::drawItems()
bg_color = mBgReadOnlyColor.get();
}
- item->draw(item_rect, fg_color, bg_color, highlight_color, mColumnPadding);
+ item->draw(item_rect, fg_color % alpha, bg_color% alpha, highlight_color % alpha, mColumnPadding);
cur_y -= mLineHeight;
}