From d16a79fc4c5d5af016db6c97efc3a7b2d08f62ce Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 24 Feb 2020 21:22:21 +0200
Subject: [PATCH] SL-12741 Moon was using fixed color
---
indra/llinventory/llsettingssky.cpp | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 8d0b37d01fb..306c7329205 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -1277,11 +1277,7 @@ LLColor4 LLSettingsSky::getTotalAmbient() const
LLColor3 LLSettingsSky::getMoonlightColor() const
{
- F32 moon_brightness = getIsMoonUp() ? getMoonBrightness() : 0.001f;
- LLColor3 moonlight_a(0.9, 0.9, 1.32);
- LLColor3 moonlight_b(0.66, 0.66, 2.0);
- LLColor3 moonlight = lerp(moonlight_b, moonlight_a, moon_brightness);
- return moonlight;
+ return getSunlightColor(); //moon and sun share light color
}
void LLSettingsSky::clampColor(LLColor3& color, F32 gamma, F32 scale) const
--
GitLab