diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:43:26 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:43:26 -0500 |
| commit | 05810f063dbe0ed87d03ea41c7d8fdc423945c6e (patch) | |
| tree | 311355a1679ef47fa1951788319e0c521a188edd /indra/newview/lltoolmorph.cpp | |
| parent | 5e376017858f6534163b0bfb6b385bdd0aeac5d3 (diff) | |
| parent | e4591a85182133811e327b579c558bb3db80d79e (diff) | |
merge changes for storm-737
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); |