From c2053e228a477aadd218fba2b5139f0f70c1daef Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 7 Dec 2021 15:29:40 -0500
Subject: [PATCH] Fix broken face selection highlight

---
 indra/newview/llface.cpp   | 2 ++
 indra/newview/pipeline.cpp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 98bd4ed9c38..00f60cefc0a 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -593,6 +593,8 @@ void LLFace::renderSelected(LLViewerTexture *imagep, const LLColor4& color)
 			gGL.multMatrix(*model_matrix);
 		}
 
+		gGL.diffuseColor4fv(color.mV);
+
 		if (mDrawablep->isState(LLDrawable::RIGGED))
 		{
 			LLVOVolume* volume = mDrawablep->getVOVolume();
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index f4e8fc79713..83802376a4b 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -9290,6 +9290,7 @@ void LLPipeline::renderDeferredLighting(LLRenderTarget *screen_target)
 	{
 		gGL.setColorMask(true, true);
 		mALRenderUtil->renderTonemap(&mHDRScreen, screen_target);
+		gGL.setColorMask(true, false);
 	}
 
     screen_target->bindTarget();
-- 
GitLab