From 97826b555b74044887b765e7a029e2763ea86308 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 2 Dec 2024 21:22:04 +0200 Subject: viewer#3169 Legacy settings should no longer be automatically converted --- indra/newview/llfloatereditextdaycycle.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llfloatereditextdaycycle.cpp') diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp index fd58cd8aaf..42307dd3f8 100644 --- a/indra/newview/llfloatereditextdaycycle.cpp +++ b/indra/newview/llfloatereditextdaycycle.cpp @@ -1712,6 +1712,7 @@ void LLFloaterEditExtDayCycle::onPickerCommitSetting(LLUUID item_id, S32 track) void LLFloaterEditExtDayCycle::showHDRNotification(const LLSettingsDay::ptr_t &pday) { + static LLCachedControl should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", false); for (U32 i = LLSettingsDay::TRACK_GROUND_LEVEL; i <= LLSettingsDay::TRACK_MAX; i++) { LLSettingsDay::CycleTrack_t &day_track = pday->getCycleTrack(i); @@ -1722,7 +1723,8 @@ void LLFloaterEditExtDayCycle::showHDRNotification(const LLSettingsDay::ptr_t &p while (iter != end) { LLSettingsSky::ptr_t sky = std::static_pointer_cast(iter->second); - if (sky + if (should_auto_adjust() + && sky && sky->canAutoAdjust() && sky->getReflectionProbeAmbiance(true) != 0.f) { -- cgit v1.2.3