From 73aa45d1058724460aa89b14a48ec87ce53a85f4 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Sat, 6 Apr 2013 05:20:07 -0700
Subject: [PATCH] Add hack around norspec 59 crash
---
NORSPEC-59-HACK.patch | 21 +++++++++++++++++++++
indra/newview/llvoavatar.cpp | 4 +++-
2 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 NORSPEC-59-HACK.patch
diff --git a/NORSPEC-59-HACK.patch b/NORSPEC-59-HACK.patch
new file mode 100644
index 00000000000..e2d9e8d9e7f
--- /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 a3093f069db..9d16c28e2fc 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;
}
--
GitLab