diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-24 09:07:06 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-24 09:07:06 -0500 |
| commit | ef1c3aac889d118530994e878d83426d4fc2ca7c (patch) | |
| tree | dd3d1240a8f5e9b7f1a60d7447b9aa3d624ada88 /indra/newview/lltoolmorph.cpp | |
| parent | f421e8701b3ef5b0230b06602fc5e937382ccc68 (diff) | |
| parent | 14d830ca43a7114140ebeb16a76829db4d21a95b (diff) | |
merge fix for storm-784
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); |