summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistctrl.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-03-02 14:06:23 -0800
committerJames Cook <james@lindenlab.com>2010-03-02 14:06:23 -0800
commitfe8d015851f74d375776791aa1adec204799037b (patch)
tree644a0dfbd4cd750d69ccbf1a82fe1fc277842d2d /indra/llui/llscrolllistctrl.cpp
parent822d042e0c04dba2cdaced8c81b50840972a7286 (diff)
parent96da7000e34585d24b4b6946a30a3fb77d668f76 (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;
}