From 29f8e04ddba3b36776b295949d03ac44d6cb3b11 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 29 Apr 2019 13:07:57 -0700
Subject: SL-11065
Modify is sun up logic to exclude condition of moon.
---
indra/llinventory/llsettingssky.cpp | 2 +-
indra/newview/pipeline.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'indra')
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 1490708ca5..aa26cd8054 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -973,7 +973,7 @@ F32 LLSettingsSky::getSunMoonGlowFactor() const
bool LLSettingsSky::getIsSunUp() const
{
LLVector3 sunDir = getSunDirection();
- return sunDir.mV[2] >= 0.0f || !getIsMoonUp();
+ return sunDir.mV[2] >= 0.0f;
}
bool LLSettingsSky::getIsMoonUp() const
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 95ee1ef488..4cd63de70c 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -10280,7 +10280,7 @@ void LLPipeline::generateSunShadow(LLCamera& camera)
//far_clip = llmin(far_clip, 128.f);
far_clip = llmin(far_clip, camera.getFar());
- //far_clip = llmax(far_clip, 256.0f);
+ far_clip = llmax(far_clip, 256.0f);
F32 range = far_clip-near_clip;
--
cgit v1.2.3