summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolmorph.cpp
diff options
context:
space:
mode:
authorAndrew Meadows <andrew@lindenlab.com>2011-01-07 15:22:22 -0800
committerAndrew Meadows <andrew@lindenlab.com>2011-01-07 15:22:22 -0800
commitd23f7df822b6c0557f9426b5e1aa660b77aba01e (patch)
tree2e86e4ec60018beabd35a54cc18fdf322a504269 /indra/newview/lltoolmorph.cpp
parentcf64ecb41dbbdcdc3c512510c4a7ebd28c832314 (diff)
parentc132d20a7433e2d09e3521a15497f661fcbd18b8 (diff)
merge
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);