summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterfixedenvironment.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2024-12-02 21:22:04 +0200
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2024-12-10 21:05:41 +0200
commit97826b555b74044887b765e7a029e2763ea86308 (patch)
tree6c8fab07dd78b1bd4474212ca644bf80bddd71e4 /indra/newview/llfloaterfixedenvironment.cpp
parent5f9fe87808bdf48186ed295e735bf2dced7e4e33 (diff)
viewer#3169 Legacy settings should no longer be automatically converted
Diffstat (limited to 'indra/newview/llfloaterfixedenvironment.cpp')
-rw-r--r--indra/newview/llfloaterfixedenvironment.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp
index e44202312b..d28c987414 100644
--- a/indra/newview/llfloaterfixedenvironment.cpp
+++ b/indra/newview/llfloaterfixedenvironment.cpp
@@ -182,8 +182,10 @@ void LLFloaterFixedEnvironment::setEditSettingsAndUpdate(const LLSettingsBase::p
LLEnvironment::instance().updateEnvironment(LLEnvironment::TRANSITION_INSTANT);
// teach user about HDR settings
+ static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", false);
if (mSettings
&& mSettings->getSettingsType() == "sky"
+ && should_auto_adjust()
&& ((LLSettingsSky*)mSettings.get())->canAutoAdjust()
&& ((LLSettingsSky*)mSettings.get())->getReflectionProbeAmbiance(true) != 0.f)
{