diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-27 14:52:46 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-27 14:52:46 -0400 |
| commit | 9a0a68aa4468ccc072be0bf310ff2a5f4cd50f61 (patch) | |
| tree | 324dc93040afe652fb2a1da4d617b794e0f2297f /indra/newview/llvoavatar.cpp | |
| parent | 7477f9054846e1d8a11d0e31c51bd35efa9b4c18 (diff) | |
| parent | cd46893057b9ec7d309059eff3f503cfaf46de56 (diff) | |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index a72d7f9227..2b0e974812 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -7899,7 +7899,7 @@ BOOL LLVOAvatar::isTextureVisible(LLVOAvatarDefines::ETextureIndex type, U32 ind // baked textures can use TE images directly return ((isTextureDefined(type) || isSelf()) && (getTEImage(type)->getID() != IMG_INVISIBLE - || LLDrawPoolAlpha::sShowDebugAlpha)); + || LLDrawPoolAlpha::sShowDebugAlpha)); } } |