diff options
author | Merov Linden <merov@lindenlab.com> | 2010-12-13 14:36:34 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-12-13 14:36:34 -0800 |
commit | 8acb521a824f4c1ce84379f225fa84b5cc681f5b (patch) | |
tree | 39adce2dd48ff9aaa3de110df994d31a2fdbe8e5 /indra/newview/lltoolmorph.cpp | |
parent | 1fb47692ffe78a2981d45cd1500306fdc850e6c9 (diff) | |
parent | 18a18f5985c76adaed040b4bdcba15cc251dbeb5 (diff) |
STORM-693 : pull into viewer-development
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); |