summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolmorph.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2010-12-15 15:47:09 -0800
committerDon Kjer <don@lindenlab.com>2010-12-15 15:47:09 -0800
commitb0ee1c818aa779edbb57f70b723132ce8d7347f7 (patch)
tree3bc9bac8b1403e0eb6eb7be7d7f07d4946f2ce8c /indra/newview/lltoolmorph.cpp
parentc3958f75d2ef6c998d99e8e97e76e4de0468ecef (diff)
parent3e1f2083abe31d54b4b57ac7e8479b79461f6062 (diff)
Merge from don_linden/viewer-sandbox
Diffstat (limited to 'indra/newview/lltoolmorph.cpp')
-rw-r--r--indra/newview/lltoolmorph.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp
index ca80a1db79..964b17d3a6 100644
--- a/indra/newview/lltoolmorph.cpp
+++ b/indra/newview/lltoolmorph.cpp
@@ -244,13 +244,13 @@ BOOL LLVisualParamHint::render()
//-----------------------------------------------------------------------------
// draw()
//-----------------------------------------------------------------------------
-void LLVisualParamHint::draw()
+void LLVisualParamHint::draw(F32 alpha)
{
if (!mIsVisible) return;
gGL.getTexUnit(0)->bind(this);
- gGL.color4f(1.f, 1.f, 1.f, 1.f);
+ gGL.color4f(1.f, 1.f, 1.f, alpha);
LLGLSUIDefault gls_ui;
gGL.begin(LLRender::QUADS);