diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-23 14:37:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-23 14:37:13 -0400 |
| commit | ac8d6e9df0ec78d5d8e86e2f209474fd7820399c (patch) | |
| tree | 1a3089f5520fe4379dacf7882d2030cbd3502602 /indra | |
| parent | 518f92126f18d5f4b8ee8eb287500fe5a7e17c99 (diff) | |
| parent | c01eba1ded607e5868a9c662bb37778bde927828 (diff) | |
merge changes for MAINT-6218
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 2555073926..005dd65e01 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -4069,11 +4069,9 @@ U32 LLVOAvatar::renderSkinned() BOOL first_pass = TRUE; if (!LLDrawPoolAvatar::sSkipOpaque) { - bool visually_muted = isVisuallyMuted(); - if (!isSelf() || gAgent.needsRenderHead() || LLPipeline::sShadowRender) { - if (isTextureVisible(TEX_HEAD_BAKED) || mIsDummy || visually_muted) + if (isTextureVisible(TEX_HEAD_BAKED) || mIsDummy) { LLViewerJoint* head_mesh = getViewerJoint(MESH_ID_HEAD); if (head_mesh) @@ -4083,7 +4081,7 @@ U32 LLVOAvatar::renderSkinned() first_pass = FALSE; } } - if (isTextureVisible(TEX_UPPER_BAKED) || mIsDummy || visually_muted) + if (isTextureVisible(TEX_UPPER_BAKED) || mIsDummy) { LLViewerJoint* upper_mesh = getViewerJoint(MESH_ID_UPPER_BODY); if (upper_mesh) @@ -4093,7 +4091,7 @@ U32 LLVOAvatar::renderSkinned() first_pass = FALSE; } - if (isTextureVisible(TEX_LOWER_BAKED) || mIsDummy || visually_muted) + if (isTextureVisible(TEX_LOWER_BAKED) || mIsDummy) { LLViewerJoint* lower_mesh = getViewerJoint(MESH_ID_LOWER_BODY); if (lower_mesh) |