From cd7293aecde0c0ff3d620ec3a68c9f82d89a2f16 Mon Sep 17 00:00:00 2001 From: Beq Date: Mon, 17 Oct 2022 15:04:43 +0100 Subject: [PATCH] [FIRE-32311] Fix for annoying "particles hidden" text Now shows when render debug is in use --- indra/newview/llviewerwindow.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 51b60b9ba2..520064b933 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -835,6 +835,13 @@ public: ypos += y_inc; } + // FIRE-32311 - Only show particle text when showing render debug info (relocate pre-existing change by Liny) + if (LLPipeline::toggleRenderTypeControlNegated(LLPipeline::RENDER_TYPE_PARTICLES)) + { + addText(xpos, ypos, particle_hiding); + ypos += y_inc; + } + // LLVertexBuffer::sBindCount = LLImageGL::sBindCount = LLVertexBuffer::sSetCount = LLImageGL::sUniqueCount = gPipeline.mNumVisibleNodes = LLPipeline::sVisibleLightCount = 0; @@ -932,14 +939,6 @@ public: } // - // pull the text saying if particles are hidden out from beacons - if (LLPipeline::toggleRenderTypeControlNegated(LLPipeline::RENDER_TYPE_PARTICLES)) - { - addText(xpos, ypos, particle_hiding); - ypos += y_inc; - } - // - // only display these messages if we are actually rendering beacons at this moment // Always show the beacon text regardless if the floater is visible // ...and if we want to see it