summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerjointmesh.cpp
diff options
context:
space:
mode:
authorleyla_linden <none@none>2011-02-23 16:38:45 -0800
committerleyla_linden <none@none>2011-02-23 16:38:45 -0800
commitb0e64098ba7dabec0b14d0129efa87b5e5a29df2 (patch)
tree1efebf171b17a4eb5a47cfba224a268dfe54e337 /indra/newview/llviewerjointmesh.cpp
parent9f537ad93fe7992bb6d652473a4ac3680320cab5 (diff)
parent34428b305a437256f5db170db91506e2d94440e9 (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