diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-11 15:41:38 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-11 15:41:38 -0700 |
| commit | 6ed0fa78d45e805c80ba32b75357229b49af6229 (patch) | |
| tree | e80cb812a174122faf9f168c95dd4a269c512f86 /indra/newview/pipeline.cpp | |
| parent | ea77028b7081af449b85f3af968c97e09323b7e4 (diff) | |
| parent | affefe2361ee73eee60bca42e3edb41c65ffa95d (diff) | |
STORM-365 : merge to viewer-beta
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index e69b0a2996..c758ce991f 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, ...) |