viewer#3169 Legacy settings should no longer be automatically converted

Author: akleshchev

indra/newview/app_settings/settings.xml

@@ -11460,6 +11460,17 @@
       <key>Value</key>
       <string />
     </map>
+    <key>SkyAutoAdjustLegacy</key>
+    <map>
+        <key>Comment</key>
+        <string>If true, environment edition floater will auto adjust to use HDR. This is the "opt-out" button for HDR and tonemapping when coupled with a sky setting that predates PBR.</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>Boolean</string>
+        <key>Value</key>
+        <integer>0</integer>
+    </map>
     <key>SkyAmbientScale</key>
     <map>
       <key>Comment</key>

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<bool> should_auto_adjust(gSavedSettings, "SkyAutoAdjustLegacy", 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<LLSettingsSky>(iter->second);
-            if (sky
+            if (should_auto_adjust()
+                && sky
                 && sky->canAutoAdjust()
                 && sky->getReflectionProbeAmbiance(true) != 0.f)
             {

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, "SkyAutoAdjustLegacy", false);
     if (mSettings
         && mSettings->getSettingsType() == "sky"
+        && should_auto_adjust
         && ((LLSettingsSky*)mSettings.get())->canAutoAdjust()
         && ((LLSettingsSky*)mSettings.get())->getReflectionProbeAmbiance(true) != 0.f)
     {