From 411aa9f727efba971c8577cef4d6a31f096a6fea Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 29 Sep 2022 00:19:52 -0500
Subject: SL-18190 Fix for haze color being completely wrong (now it's just
 half wrong).

---
 indra/newview/llmaterialeditor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llmaterialeditor.cpp')

diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 3245c6629a..27694e9ce4 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -413,12 +413,12 @@ void LLMaterialEditor::setEmissiveUploadId(const LLUUID& id)
 
 LLColor4 LLMaterialEditor::getEmissiveColor()
 {
-    return LLColor4(childGetValue("emissive color"));
+    return linearColor4(LLColor4(childGetValue("emissive color")));
 }
 
 void LLMaterialEditor::setEmissiveColor(const LLColor4& color)
 {
-    childSetValue("emissive color", color.getValue());
+    childSetValue("emissive color", srgbColor4(color).getValue());
 }
 
 LLUUID LLMaterialEditor::getNormalId()
-- 
cgit v1.2.3