summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-09-29 23:28:51 -0500
committerDave Parks <davep@lindenlab.com>2011-09-29 23:28:51 -0500
commitccf751e78ee551648e4ae29f2e7c0e7288cd7168 (patch)
tree73bb77d522269822b9e955026348203ab3576211 /indra/newview
parent22d52ab5833850c88a3b143123aef2142b836c70 (diff)
SH-2370 Fix for alpha masked objects not getting highlighted when highlight transparent enabled.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lldrawpoolalpha.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index a5032d007f..230c4e2638 100644
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -333,6 +333,10 @@ void LLDrawPoolAlpha::render(S32 pass)
gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sSmokeImagep, TRUE) ;
renderAlphaHighlight(LLVertexBuffer::MAP_VERTEX |
LLVertexBuffer::MAP_TEXCOORD0);
+
+ pushBatches(LLRenderPass::PASS_ALPHA_MASK, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, FALSE);
+ pushBatches(LLRenderPass::PASS_FULLBRIGHT_ALPHA_MASK, LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, FALSE);
+
if(shaders)
{
gHighlightProgram.unbind();