diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2019-09-24 14:35:26 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2019-09-24 14:35:26 -0400 |
commit | 77621dd3fc99f4fb1285a929e0b56b019f6b65c2 (patch) | |
tree | 4de95909b29874f492206b090b2e233b8acb596c /indra/newview/pipeline.cpp | |
parent | 8053bceaa0ccd6128536375c21cc3e9e19429efa (diff) | |
parent | e241670694959833feaa0e667222b337095eb683 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-vs2017
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r-- | indra/newview/pipeline.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index a72244929e..bd73c234a6 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -4062,7 +4062,6 @@ void LLPipeline::postSort(LLCamera& camera) void render_hud_elements() { - LL_RECORD_BLOCK_TIME(FTM_RENDER_UI); gPipeline.disableLights(); LLGLDisable fog(GL_FOG); |