diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-25 16:54:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-25 16:54:49 -0400 |
| commit | 6f953cc97b90eff43d69c2bda28fc9863fc57214 (patch) | |
| tree | 326124bad515a7831631863d91348549568bb9ee /indra/newview/llvoavatar.cpp | |
| parent | d7136bac52dc36cca1f5b89fdc26fd323be468c5 (diff) | |
| parent | 3a2576cefa97f50640adb596a5d01fa287f7033f (diff) | |
merge changes for latest rendering fixes
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index f861f49296..f5b8244509 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -4336,6 +4336,15 @@ U32 LLVOAvatar::renderTransparent(BOOL first_pass) gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT); } +#if LL_DARWIN + // blatant hack to avoid driver crash on rendering mMeshLODs for eyelashes and baked hair below + // NORSPEC-59 + if (gGLManager.mIsMobileGF) + { + return num_indices; + } +#endif + if (!isSelf() || gAgent.needsRenderHead() || LLPipeline::sShadowRender) { if (LLPipeline::sImpostorRender) |