diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-09 17:09:52 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-09 17:09:52 -0400 |
| commit | 8f84d75ae42f4bb6f3305c64e95bc4a070b774a6 (patch) | |
| tree | ae3696ae60547d60516f0847c59a1bbaad73b5e9 /indra/newview/llvoavatar.cpp | |
| parent | 0229b65a4d40287454bd690a414b6ce8f63856ea (diff) | |
| parent | 991a3cf40eb22559f89808a87fdeda1d44eaaf8f (diff) | |
merge fixes from graham
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index a3093f069d..9d16c28e2f 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -4336,6 +4336,7 @@ U32 LLVOAvatar::renderTransparent(BOOL first_pass) gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT); } +#if !LL_DARWIN if (!isSelf() || gAgent.needsRenderHead() || LLPipeline::sShadowRender) { if (LLPipeline::sImpostorRender) @@ -4362,7 +4363,8 @@ U32 LLVOAvatar::renderTransparent(BOOL first_pass) gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT); } } - +#endif + return num_indices; } |