diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-02-11 17:04:28 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-02-11 17:04:28 +0000 |
| commit | 9677e50626d03bff82d35035ff6b5b7d87d36dae (patch) | |
| tree | a37ad6fbbfb7c25ee385dd13eaf4dbac124083c3 /indra/llinventory/llsettingssky.cpp | |
| parent | a1c2d021261d38de7dabd0863dd264ac3bf50523 (diff) | |
| parent | 3e0c9087cd6b26a64831f99bf9be05daa1dec510 (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #274)
SL-10457, SL-10414
Diffstat (limited to 'indra/llinventory/llsettingssky.cpp')
| -rw-r--r-- | indra/llinventory/llsettingssky.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp index 72a3c7b01c..af7425cca0 100644 --- a/indra/llinventory/llsettingssky.cpp +++ b/indra/llinventory/llsettingssky.cpp @@ -954,7 +954,7 @@ void LLSettingsSky::updateSettings() F32 LLSettingsSky::getSunMoonGlowFactor() const { - LLVector3 sunDir = getSunDirection(); + LLVector3 sunDir = getSunDirection(); LLVector3 moonDir = getMoonDirection(); // sun glow at full iff moon is not up @@ -968,7 +968,7 @@ F32 LLSettingsSky::getSunMoonGlowFactor() const if (moonDir.mV[2] > 0.0f) { - return moonDir.mV[VZ] / 3.0f; // ramp moon glow at moonset + return 0.25f; } return 0.0f; |