From e8e258be1f1dcd25f7c2fa7f01836050c9bd80fc Mon Sep 17 00:00:00 2001 From: Rye Cogtail Date: Thu, 3 Oct 2024 02:55:57 -0400 Subject: Fix pink flash when window is resized introduced in 6ebd6494a75d9b3d34e45655d79d0027fbba3898 --- indra/newview/pipeline.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index e7703b0ffe..84f026699e 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -8342,7 +8342,9 @@ void LLPipeline::renderDeferredLighting() unbindDeferredShader(gDeferredBlurLightProgram); } screen_target->bindTarget(); - screen_target->invalidate(GL_COLOR_BUFFER_BIT); + // clear color buffer here - zeroing alpha (glow) is important or it will accumulate against sky + glClearColor(0, 0, 0, 0); + screen_target->clear(GL_COLOR_BUFFER_BIT); if (RenderDeferredAtmospheric) { // apply sunlight contribution -- cgit v1.2.3 From 6181a79170bce2987c1d98ec69ab7d69d4c7f138 Mon Sep 17 00:00:00 2001 From: Rye Cogtail Date: Thu, 3 Oct 2024 03:23:29 -0400 Subject: Fix LLFlatListView::getRequiredRect not overriding base class warning --- indra/llui/llflatlistview.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h index 3c40f91ab0..112c330a15 100644 --- a/indra/llui/llflatlistview.h +++ b/indra/llui/llflatlistview.h @@ -126,7 +126,7 @@ public: /** Returns full rect of child panel */ const LLRect& getItemsRect() const; - LLRect getRequiredRect() const { return getItemsRect(); } + LLRect getRequiredRect() { return getItemsRect(); } /** Returns distance between items */ const S32 getItemsPad() const { return mItemPad; } -- cgit v1.2.3