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 /NORSPEC-59-HACK.patch | |
| parent | 0229b65a4d40287454bd690a414b6ce8f63856ea (diff) | |
| parent | 991a3cf40eb22559f89808a87fdeda1d44eaaf8f (diff) | |
merge fixes from graham
Diffstat (limited to 'NORSPEC-59-HACK.patch')
| -rw-r--r-- | NORSPEC-59-HACK.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/NORSPEC-59-HACK.patch b/NORSPEC-59-HACK.patch new file mode 100644 index 0000000000..e2d9e8d9e7 --- /dev/null +++ b/NORSPEC-59-HACK.patch @@ -0,0 +1,21 @@ +diff -r 0b4f135cdbe8 indra/newview/llvoavatar.cpp +--- a/indra/newview/llvoavatar.cpp Thu Apr 04 09:18:46 2013 -0700 ++++ b/indra/newview/llvoavatar.cpp Sat Apr 06 05:18:35 2013 -0700 +@@ -4336,6 +4336,7 @@ + gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT); + } + ++#if !LL_DARWIN + if (!isSelf() || gAgent.needsRenderHead() || LLPipeline::sShadowRender) + { + if (LLPipeline::sImpostorRender) +@@ -4362,7 +4363,8 @@ + gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT); + } + } +- ++#endif ++ + return num_indices; + } + |