summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-05-14 16:20:54 -0500
committerDave Parks <davep@lindenlab.com>2013-05-14 16:20:54 -0500
commit46eface63c94ca7e047b731f140aeaacfc4860e4 (patch)
tree8b6d4fad01e54ac220d437346737f71366bed2d4 /indra/newview
parentbe712ba6b56bc087c947203290d172275aa975d9 (diff)
NORSPEC-181 Fix for performance regression.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llvovolume.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 1021615255..52d05c8030 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4183,13 +4183,13 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
draw_info->mSpecColor = specColor;
draw_info->mEnvIntensity = spec;
draw_info->mSpecularMap = NULL;
+ draw_info->mMaterial = mat;
+ draw_info->mShaderMask = shader_mask;
if (mat)
{
// We have a material. Update our draw info accordingly.
- draw_info->mMaterial = mat;
- draw_info->mShaderMask = shader_mask;
-
+
if (!mat->getSpecularID().isNull())
{
LLVector4 specColor;