summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerjointmesh.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-02-17 17:19:13 -0600
committerDave Parks <davep@lindenlab.com>2011-02-17 17:19:13 -0600
commita5bc626ee32765774066397e803cc01bd663380c (patch)
treef91e68142e10a70e3980bbc6dc1accd1bf36ad0c /indra/newview/llviewerjointmesh.cpp
parentc05f3d384b747cfc2c732bad139e12e834507cf9 (diff)
parent9e0ee4dff0109326c31425581437a44351d08344 (diff)
merge
Diffstat (limited to 'indra/newview/llviewerjointmesh.cpp')
-rw-r--r--indra/newview/llviewerjointmesh.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp
index 14b9a03fd5..aa6da5c9f3 100644
--- a/indra/newview/llviewerjointmesh.cpp
+++ b/indra/newview/llviewerjointmesh.cpp
@@ -533,7 +533,7 @@ U32 LLViewerJointMesh::drawShape( F32 pixelArea, BOOL first_pass, BOOL is_dummy)
stop_glerror();
- LLGLSSpecular specular(LLColor4(1.f,1.f,1.f,1.f), mShiny && !(mFace->getPool()->getVertexShaderLevel() > 0));
+ LLGLSSpecular specular(LLColor4(1.f,1.f,1.f,1.f), mFace->getPool()->getVertexShaderLevel() > 0 ? 0.f : mShiny);
//----------------------------------------------------------------
// setup current texture