diff options
| author | Eric Tulla <tulla@lindenlab.com> | 2009-03-05 00:29:27 +0000 |
|---|---|---|
| committer | Eric Tulla <tulla@lindenlab.com> | 2009-03-05 00:29:27 +0000 |
| commit | 6db6d81b0a90fe7b48a3ccf64ba768e5772397c8 (patch) | |
| tree | c3b9f11fbbfa29cd23b7de22543fd80285ad810d /indra/newview/lltoolmorph.cpp | |
| parent | c0af95e18c57a7e0578df780697042f8a6221431 (diff) | |
Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).
No conflicts in the merge.
Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
Diffstat (limited to 'indra/newview/lltoolmorph.cpp')
| -rw-r--r-- | indra/newview/lltoolmorph.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp index f15f0f44b0..75e19645a6 100644 --- a/indra/newview/lltoolmorph.cpp +++ b/indra/newview/lltoolmorph.cpp @@ -237,7 +237,11 @@ BOOL LLVisualParamHint::render() { LLDrawPoolAvatar *avatarPoolp = (LLDrawPoolAvatar *)avatarp->mDrawable->getFace(0)->getPool(); LLGLDepthTest gls_depth(GL_TRUE, GL_TRUE); + gGL.setAlphaRejectSettings(LLRender::CF_ALWAYS); + gGL.setSceneBlendType(LLRender::BT_REPLACE); avatarPoolp->renderAvatars(avatarp); // renders only one avatar + gGL.setSceneBlendType(LLRender::BT_ALPHA); + gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT); } avatarp->setVisualParamWeight(mVisualParam, mLastParamWeight); gGL.color4f(1,1,1,1); |