summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-08-05 09:12:41 -0700
committerGraham Linden <graham@lindenlab.com>2013-08-05 09:12:41 -0700
commit614ee255c6ed782138daecbc8aa886fb0f4e93e2 (patch)
treede886ac9124e0c9ddb9b4a082c680b0e6935a4dd /indra/newview/llvovolume.cpp
parent08e429e27df488cb8740eb82f3fb10d5011e6f5d (diff)
NORSPEC-336 intentionally rebreak 304 to fix glow while we find a fix that works for both
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rwxr-xr-xindra/newview/llvovolume.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 3eb5b19de5..5dc59197ca 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;