From 614ee255c6ed782138daecbc8aa886fb0f4e93e2 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 5 Aug 2013 09:12:41 -0700
Subject: [PATCH] NORSPEC-336 intentionally rebreak 304 to fix glow while we
find a fix that works for both
---
indra/newview/llvovolume.cpp | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 3eb5b19de59..5dc59197caf 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4880,11 +4880,8 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
if (emissive)
{ //emissive faces are present, include emissive byte to preserve batching
- simple_mask = simple_mask | LLVertexBuffer::MAP_EMISSIVE;
-
- // doing this seems to cause NORSPEC-304
- //alpha_mask = alpha_mask | LLVertexBuffer::MAP_EMISSIVE;
-
+ simple_mask = simple_mask | LLVertexBuffer::MAP_EMISSIVE;
+ alpha_mask = alpha_mask | LLVertexBuffer::MAP_EMISSIVE;
bump_mask = bump_mask | LLVertexBuffer::MAP_EMISSIVE;
fullbright_mask = fullbright_mask | LLVertexBuffer::MAP_EMISSIVE;
norm_mask = norm_mask | LLVertexBuffer::MAP_EMISSIVE;
--
GitLab