diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-06 05:20:07 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-06 05:20:07 -0700 |
| commit | 73aa45d1058724460aa89b14a48ec87ce53a85f4 (patch) | |
| tree | 541baab36ff1a2ccf8fd583a537b6cd2747fc997 | |
| parent | 1741d82a1d1c057009558dc772cdecf5989c4d3f (diff) | |
Add hack around norspec 59 crash
| -rw-r--r-- | NORSPEC-59-HACK.patch | 21 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 4 |
2 files changed, 24 insertions, 1 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; + } + 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; } |