summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatereditextdaycycle.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-27 00:14:56 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-27 00:14:56 +0200
commit78174fc8658caeddfd8306ec19eb0e1c2975368e (patch)
tree0948d578f384fbd247eefd2dff771a9cd8cbd8c1 /indra/newview/llfloatereditextdaycycle.cpp
parent689ef9442581d7af8ff0e0264be4919fe6cffd73 (diff)
parent9567393f803dfb0c786b8e917e41c8f4b8b22af7 (diff)
Merge remote-tracking branch 'origin/main' into DRTVWR-588-maint-W
# Conflicts: # .github/workflows/build.yaml
Diffstat (limited to 'indra/newview/llfloatereditextdaycycle.cpp')
-rw-r--r--indra/newview/llfloatereditextdaycycle.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index bb47feaa95..4e764674e5 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -1724,7 +1724,9 @@ void LLFloaterEditExtDayCycle::showHDRNotification(const LLSettingsDay::ptr_t &p
while (iter != end)
{
LLSettingsSky::ptr_t sky = std::static_pointer_cast<LLSettingsSky>(iter->second);
- if (sky && sky->canAutoAdjust())
+ if (sky
+ && sky->canAutoAdjust()
+ && sky->getReflectionProbeAmbiance(true) != 0.f)
{
LLNotificationsUtil::add("AutoAdjustHDRSky");
return;