diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-20 17:14:51 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-20 17:14:51 -0500 |
commit | 261ac32dda439fa1fc5708c78168967bf4d484e6 (patch) | |
tree | 22f0e531422f6b39b40ed943c80e13634a15e7a4 /indra/newview/lltoolmorph.cpp | |
parent | 4bd6edc6b037195012583467a3e5e754f6a5af77 (diff) | |
parent | e9d21ba941a52665d7ad2ee3483c6ac7b7ec6486 (diff) |
merge
Diffstat (limited to 'indra/newview/lltoolmorph.cpp')
-rw-r--r-- | indra/newview/lltoolmorph.cpp | 4 |
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); |