summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-02-24 21:22:21 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-02-24 21:22:21 +0200
commitd16a79fc4c5d5af016db6c97efc3a7b2d08f62ce (patch)
tree071003eec1e66e4f3871f0f5776606953fcc4ce9
parent7f1b4b22e69f2ad9c404b2e54a17c2ed4fa161da (diff)
SL-12741 Moon was using fixed color
-rw-r--r--indra/llinventory/llsettingssky.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 8d0b37d01f..306c732920 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