From 41097e74ecea7f99d2e4b0ee03dfa40ed6463f46 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 10 Apr 2013 01:24:26 -0500
Subject: [PATCH] NORSPEC-75 Fix bug introduced by previous change where
 objects with an emissive mask appear fullbright.

---
 indra/newview/lldrawpoolsimple.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/indra/newview/lldrawpoolsimple.cpp b/indra/newview/lldrawpoolsimple.cpp
index 1dbaad9c18d..1a6293c0105 100644
--- a/indra/newview/lldrawpoolsimple.cpp
+++ b/indra/newview/lldrawpoolsimple.cpp
@@ -359,11 +359,6 @@ void LLDrawPoolFullbright::renderPostDeferred(S32 pass)
 	gGL.setSceneBlendType(LLRender::BT_ALPHA);
 	U32 fullbright_mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0 | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_TEXTURE_INDEX;
 	pushBatches(LLRenderPass::PASS_FULLBRIGHT, fullbright_mask, TRUE, TRUE);
-
-	pushBatches(LLRenderPass::PASS_MATERIAL_ALPHA_EMISSIVE, fullbright_mask, TRUE, FALSE);
-	pushBatches(LLRenderPass::PASS_SPECMAP_EMISSIVE, fullbright_mask, TRUE, FALSE);
-	pushBatches(LLRenderPass::PASS_NORMMAP_EMISSIVE, fullbright_mask, TRUE, FALSE);
-	pushBatches(LLRenderPass::PASS_NORMSPEC_EMISSIVE, fullbright_mask, TRUE, FALSE);
 }
 
 void LLDrawPoolFullbright::endPostDeferredPass(S32 pass)
-- 
GitLab