diff options
author | callum <none@none> | 2012-06-29 10:36:04 -0700 |
---|---|---|
committer | callum <none@none> | 2012-06-29 10:36:04 -0700 |
commit | 11686a0917c7e6e67920aca46ade4624c5027c0e (patch) | |
tree | 69f56b63cf711b6aef97e0b06d981e5c8087375a /indra/newview/lldrawpoolavatar.cpp | |
parent | fd4708c2c4f221d9f2029072f786e169e119ba1a (diff) | |
parent | 326634e1bf9b87e9c9311b67539abb43323bd33c (diff) |
Merge with viewer-beta
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
-rw-r--r-- | indra/newview/lldrawpoolavatar.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp index 0103373fd2..ace3a20bbb 100644 --- a/indra/newview/lldrawpoolavatar.cpp +++ b/indra/newview/lldrawpoolavatar.cpp @@ -261,7 +261,9 @@ void LLDrawPoolAvatar::beginPostDeferredAlpha() sRenderingSkinned = TRUE; gPipeline.bindDeferredShader(*sVertexProgram); - + + sVertexProgram->setMinimumAlpha(0.2f); + sDiffuseChannel = sVertexProgram->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP); } |