Skip to content

Commit f42391b

Browse files
akleshchevakleshchev
committed
viewer#3169 Legacy settings should no longer be automatically converted #2
Cover rendering as well
1 parent 377d9a9 commit f42391b

File tree

8 files changed

+14
-25
lines changed

8 files changed

+14
-25
lines changed

‎indra/newview/app_settings/settings.xml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9400,7 +9400,7 @@
94009400
<key>Type</key>
94019401
<string>Boolean</string>
94029402
<key>Value</key>
9403-
<integer>1</integer>
9403+
<integer>0</integer>
94049404
</map>
94059405
<key>RenderSkyAutoAdjustAmbientScale</key>
94069406
<map>
@@ -11460,17 +11460,6 @@
1146011460
<key>Value</key>
1146111461
<string />
1146211462
</map>
11463-
<key>SkyAutoAdjustLegacy</key>
11464-
<map>
11465-
<key>Comment</key>
11466-
<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>
11467-
<key>Persist</key>
11468-
<integer>1</integer>
11469-
<key>Type</key>
11470-
<string>Boolean</string>
11471-
<key>Value</key>
11472-
<integer>0</integer>
11473-
</map>
1147411463
<key>SkyAmbientScale</key>
1147511464
<map>
1147611465
<key>Comment</key>

‎indra/newview/llfloatereditextdaycycle.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1712,7 +1712,7 @@ void LLFloaterEditExtDayCycle::onPickerCommitSetting(LLUUID item_id, S32 track)
17121712

17131713
void LLFloaterEditExtDayCycle::showHDRNotification(const LLSettingsDay::ptr_t &pday)
17141714
{
1715-
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "SkyAutoAdjustLegacy", false);
1715+
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", false);
17161716
for (U32 i = LLSettingsDay::TRACK_GROUND_LEVEL; i <= LLSettingsDay::TRACK_MAX; i++)
17171717
{
17181718
LLSettingsDay::CycleTrack_t &day_track = pday->getCycleTrack(i);

‎indra/newview/llfloaterenvironmentadjust.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ void LLFloaterEnvironmentAdjust::refresh()
178178
getChild<LLTextureCtrl>(FIELD_SKY_CLOUD_MAP)->setValue(mLiveSky->getCloudNoiseTextureId());
179179
getChild<LLTextureCtrl>(FIELD_WATER_NORMAL_MAP)->setValue(mLiveWater->getNormalMapID());
180180

181-
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", true);
181+
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", false);
182182
getChild<LLUICtrl>(FIELD_REFLECTION_PROBE_AMBIANCE)->setValue(mLiveSky->getReflectionProbeAmbiance(should_auto_adjust));
183183

184184
LLColor3 glow(mLiveSky->getGlow());
@@ -494,7 +494,7 @@ void LLFloaterEnvironmentAdjust::updateGammaLabel()
494494
{
495495
if (!mLiveSky) return;
496496

497-
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", true);
497+
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", false);
498498
F32 ambiance = mLiveSky->getReflectionProbeAmbiance(should_auto_adjust);
499499
if (ambiance != 0.f)
500500
{

‎indra/newview/llfloaterfixedenvironment.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,10 @@ void LLFloaterFixedEnvironment::setEditSettingsAndUpdate(const LLSettingsBase::p
182182
LLEnvironment::instance().updateEnvironment(LLEnvironment::TRANSITION_INSTANT);
183183

184184
// teach user about HDR settings
185-
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "SkyAutoAdjustLegacy", false);
185+
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", false);
186186
if (mSettings
187187
&& mSettings->getSettingsType() == "sky"
188-
&& should_auto_adjust
188+
&& should_auto_adjust()
189189
&& ((LLSettingsSky*)mSettings.get())->canAutoAdjust()
190190
&& ((LLSettingsSky*)mSettings.get())->getReflectionProbeAmbiance(true) != 0.f)
191191
{

‎indra/newview/llpaneleditsky.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ void LLPanelSettingsSkyAtmosTab::refresh()
208208
F32 droplet_radius = mSkySettings->getSkyDropletRadius();
209209
F32 ice_level = mSkySettings->getSkyIceLevel();
210210

211-
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", true);
211+
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", false);
212212
F32 rp_ambiance = mSkySettings->getReflectionProbeAmbiance(should_auto_adjust);
213213

214214
getChild<LLUICtrl>(FIELD_SKY_DENSITY_MOISTURE_LEVEL)->setValue(moisture_level);

‎indra/newview/llreflectionmapmanager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ void LLReflectionMapManager::updateUniforms()
10741074
LLEnvironment& environment = LLEnvironment::instance();
10751075
LLSettingsSky::ptr_t psky = environment.getCurrentSky();
10761076

1077-
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", true);
1077+
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", false);
10781078
F32 minimum_ambiance = psky->getReflectionProbeAmbiance(should_auto_adjust);
10791079

10801080
bool is_ambiance_pass = gCubeSnapshot && !isRadiancePass();

‎indra/newview/llsettingsvo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ void LLSettingsVOSky::applySpecial(void *ptarget, bool force)
795795
F32 g = getGamma();
796796

797797
static LLCachedControl<bool> hdr(gSavedSettings, "RenderHDREnabled");
798-
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", true);
798+
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", false);
799799
static LLCachedControl<F32> auto_adjust_ambient_scale(gSavedSettings, "RenderSkyAutoAdjustAmbientScale", 0.75f);
800800
static LLCachedControl<F32> auto_adjust_hdr_scale(gSavedSettings, "RenderSkyAutoAdjustHDRScale", 2.f);
801801
static LLCachedControl<F32> auto_adjust_blue_horizon_scale(gSavedSettings, "RenderSkyAutoAdjustBlueHorizonScale", 1.f);

‎indra/newview/pipeline.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7059,7 +7059,7 @@ void LLPipeline::generateExposure(LLRenderTarget* src, LLRenderTarget* dst, bool
70597059
static LLStaticHashedString dynamic_exposure_params("dynamic_exposure_params");
70607060
static LLStaticHashedString dynamic_exposure_params2("dynamic_exposure_params2");
70617061
static LLStaticHashedString dynamic_exposure_e("dynamic_exposure_enabled");
7062-
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", true);
7062+
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", false);
70637063
static LLCachedControl<bool> dynamic_exposure_enabled(gSavedSettings, "RenderDynamicExposureEnabled", true);
70647064
static LLCachedControl<F32> dynamic_exposure_coefficient(gSavedSettings, "RenderDynamicExposureCoefficient", 0.175f);
70657065
static LLCachedControl<F32> dynamic_exposure_speed_error(gSavedSettings, "RenderDynamicExposureSpeedError", 0.1f);
@@ -7115,7 +7115,7 @@ void LLPipeline::tonemap(LLRenderTarget* src, LLRenderTarget* dst, bool gamma_co
71157115

71167116
// Apply gamma correction to the frame here.
71177117

7118-
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", true);
7118+
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", false);
71197119

71207120
LLSettingsSky::ptr_t psky = LLEnvironment::instance().getCurrentSky();
71217121

@@ -7173,7 +7173,7 @@ void LLPipeline::gammaCorrect(LLRenderTarget* src, LLRenderTarget* dst)
71737173
LLGLDepthTest depth(GL_FALSE, GL_FALSE);
71747174

71757175
static LLCachedControl<bool> buildNoPost(gSavedSettings, "RenderDisablePostProcessing", false);
7176-
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", true);
7176+
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", false);
71777177

71787178
bool no_post = gSnapshotNoPost || (buildNoPost && gFloaterTools->isAvailable());
71797179
LLSettingsSky::ptr_t psky = LLEnvironment::instance().getCurrentSky();
@@ -7331,7 +7331,7 @@ void LLPipeline::generateGlow(LLRenderTarget* src)
73317331
void LLPipeline::applyCAS(LLRenderTarget* src, LLRenderTarget* dst)
73327332
{
73337333
static LLCachedControl<F32> cas_sharpness(gSavedSettings, "RenderCASSharpness", 0.4f);
7334-
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", true);
7334+
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", false);
73357335
static LLCachedControl<bool> buildNoPost(gSavedSettings, "RenderDisablePostProcessing", false);
73367336

73377337
LL_PROFILE_GPU_ZONE("cas");
@@ -8227,7 +8227,7 @@ void LLPipeline::bindDeferredShader(LLGLSLShader& shader, LLRenderTarget* light_
82278227
shader.uniform1i(LLShaderMgr::CUBE_SNAPSHOT, gCubeSnapshot ? 1 : 0);
82288228

82298229
// auto adjust legacy sun color if needed
8230-
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", true);
8230+
static LLCachedControl<bool> should_auto_adjust(gSavedSettings, "RenderSkyAutoAdjustLegacy", false);
82318231
static LLCachedControl<F32> auto_adjust_sun_color_scale(gSavedSettings, "RenderSkyAutoAdjustSunColorScale", 1.f);
82328232
LLSettingsSky::ptr_t psky = LLEnvironment::instance().getCurrentSky();
82338233
LLColor3 sun_diffuse(mSunDiffuse.mV);

0 commit comments

Comments
 (0)