diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-11 18:30:22 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-11 18:30:22 -0700 |
| commit | a8fbfa40ba6153668e1f713ae0e128224b4f400f (patch) | |
| tree | bc2210d3055fa2ee14da52a64f6f0cb478f80c60 /indra/newview/pipeline.cpp | |
| parent | 48c2b2496d3ed6aeeebb0bc8950725f8ef7e305f (diff) | |
| parent | 418cb8689f54def3377369842b3635ad28013374 (diff) | |
pull viewer-beta into viewer-development
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index e69b0a2996..b4a5777f10 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -870,6 +870,11 @@ BOOL LLPipeline::canUseWindLightShadersOnObjects() const && LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_OBJECT) > 0); } +BOOL LLPipeline::canUseAntiAliasing() const +{ + return (gSavedSettings.getBOOL("RenderUseFBO")); +} + void LLPipeline::unloadShaders() { LLMemType mt_us(LLMemType::MTYPE_PIPELINE_UNLOAD_SHADERS); @@ -9049,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, ...) |