From affefe2361ee73eee60bca42e3edb41c65ffa95d Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 11 Oct 2010 14:42:00 -0700
Subject: [PATCH] STORM-365 : Quick fix for attachments being visible in
mouselook
---
indra/newview/pipeline.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index e69b0a29963..c758ce991f6 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -9049,7 +9049,10 @@ LLCullResult::sg_list_t::iterator LLPipeline::endAlphaGroups()
BOOL LLPipeline::hasRenderType(const U32 type) const
{
- return mRenderTypeEnabled[type];
+ // STORM-365 : LLViewerJointAttachment::setAttachmentVisibility() is setting type to 0 to actually mean "do not render"
+ // We then need to test that value here and return FALSE to prevent attachment to render (in mouselook for instance)
+ // TODO: reintroduce RENDER_TYPE_NONE in LLRenderTypeMask and initialize its mRenderTypeEnabled[RENDER_TYPE_NONE] to FALSE explicitely
+ return (type == 0 ? FALSE : mRenderTypeEnabled[type]);
}
void LLPipeline::setRenderTypeMask(U32 type, ...)
--
GitLab