diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-12 17:06:13 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-12 17:06:13 -0400 |
| commit | e1bd35de109dbd49cabd9bba97151b2b343ff5d2 (patch) | |
| tree | c4a55790235b48453734283287ec275b9d80c770 /indra/newview/pipeline.cpp | |
| parent | 7b2b23c2b0e39564c8661894b5d847ce6337d207 (diff) | |
| parent | 8964526beac48fe948689145857f71256a6d8f53 (diff) | |
Automated merge up from 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 cb24720e7b..b4a5777f10 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -9054,7 +9054,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, ...) |