summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-05-06 13:45:49 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-05-06 13:45:49 -0700
commit792f606093daf89873342d3465eda296e329d407 (patch)
treee576f4e0f1d8d223c5adc5ad531895fee8747eea /indra/newview
parentbeb053003d4865a8209cf0fe7c34a03aa6788fe5 (diff)
NORSPEC-118 fix regression of 118 from extra conditions added for 151
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llvovolume.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 6cfdc1e9c6..50228476d8 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4167,7 +4167,7 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
draw_info->mEnvIntensity = spec;
draw_info->mSpecularMap = NULL;
- if (mat && LLPipeline::sRenderBump && LLPipeline::sRenderDeferred)
+ if (mat)
{
// We have a material. Update our draw info accordingly.
draw_info->mMaterial = mat;