diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-14 14:46:21 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-14 14:46:21 -0500 |
| commit | 7c0c86774f601cab3e0ca1598ea786b803c5bc71 (patch) | |
| tree | f8b6b447a40f5ccc69032b581443e2cf2e17c6dc /indra/newview/lltoolmorph.cpp | |
| parent | d3eccbcd8b9bc51b1a940325509b9508c3697391 (diff) | |
| parent | 0b6c4d0f668c1fc95bac1807a9fd5f5568c7c278 (diff) | |
merge fix for storm-229
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); |