diff options
| author | callum_linden <none@none> | 2014-10-20 11:28:39 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-20 11:28:39 -0700 |
| commit | c87185b7144e0265ef10d119f0c4c368f95a4fda (patch) | |
| tree | c741467c02b80d46e0931eda339d0644efb0f42d /indra | |
| parent | 1a974f227de5f3d6c42dd5b836acab8edd28171c (diff) | |
Update to build on Xcode 6.0: clang demands logical comparison brackets
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 22b979aa09..3460e7beeb 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -4156,8 +4156,8 @@ U32 LLVOAvatar::renderTransparent(BOOL first_pass) } // Can't test for baked hair being defined, since that won't always be the case (not all viewers send baked hair) // TODO: 1.25 will be able to switch this logic back to calling isTextureVisible(); - if ( getImage(TEX_HAIR_BAKED, 0) && - getImage(TEX_HAIR_BAKED, 0)->getID() != IMG_INVISIBLE || LLDrawPoolAlpha::sShowDebugAlpha) + if ( ( getImage(TEX_HAIR_BAKED, 0) && + getImage(TEX_HAIR_BAKED, 0)->getID() != IMG_INVISIBLE ) || LLDrawPoolAlpha::sShowDebugAlpha) { LLViewerJoint* hair_mesh = getViewerJoint(MESH_ID_HAIR); if (hair_mesh) |