From 27c96405a489327302ebeb7d192788447932d7f1 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 13 May 2019 09:49:53 -0700
Subject: SL-10996

Restore old sun matrix gen code.

Make sky use correct colorspace.

Make sunlight color the CPU-generated WL color when not using atmo shaders or deferred (helps 11107).
---
 indra/newview/llvosky.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index a181fdaf50..7e0f377953 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -207,10 +207,14 @@ void LLSkyTex::create(const F32 brightness)
 
 void LLSkyTex::createGLImage(S32 which)
 {	
-    if (LLPipeline::RenderDeferred) {
+#if USE_SRGB_DECODE
+    if (LLPipeline::RenderDeferred)
+    {
         mTexture[which]->setExplicitFormat(GL_SRGB8_ALPHA8, GL_RGBA);
     }
-    else {
+    else
+#endif
+    {
         mTexture[which]->setExplicitFormat(GL_RGBA8, GL_RGBA);
     }
 	mTexture[which]->createGLTexture(0, mImageRaw[which], 0, TRUE, LLGLTexture::LOCAL);
-- 
cgit v1.2.3