diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-16 11:12:15 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-16 11:12:15 -0500 |
| commit | ee0055f5af672bef8402679fe8cc41717b0b9678 (patch) | |
| tree | d2c025aa4d9469d98a0c8544e1634eedfbad0c84 /indra/newview/lltoolmorph.cpp | |
| parent | ad625861e120cae967d6bc60a9c1f4d86f4c2ed1 (diff) | |
| parent | 73962e2134035855def0177db171d8eddaa193cb (diff) | |
Automated merge up from 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); |