diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2024-11-27 17:41:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-27 17:41:44 -0500 |
| commit | 6128a7dea713fdc01ae7a253dac2bb99dd585873 (patch) | |
| tree | 9b9849d5cc231fdfad0220fe411102eeed106eff /indra/newview | |
| parent | fd0389c9f04dac4b0e4ad13d10e520aad5cb2e61 (diff) | |
Make sure CAS controls are not active with vintage mode. (#3176)
Also make extra sure vintage mode is enabled when GL3 is detected.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfeaturemanager.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llfloaterpreferencesgraphicsadvanced.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 2ad1257695..22ba20100e 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -717,6 +717,9 @@ void LLFeatureManager::applyBaseMasks() // make sure to disable background context activity in GL3 mode LLImageGLThread::sEnabledMedia = false; LLImageGLThread::sEnabledTextures = false; + + // Make extra sure that vintage mode also gets enabled. + gSavedSettings.setBOOL("RenderVintageMode", true); } // now mask by gpu string diff --git a/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp b/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp index 65f3cc5db4..89ff9988a6 100644 --- a/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp +++ b/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp @@ -271,6 +271,7 @@ void LLFloaterPreferenceGraphicsAdvanced::disableUnavailableSettings() LLCheckBoxCtrl* ctrl_dof = getChild<LLCheckBoxCtrl>("UseDoF"); LLSliderCtrl* sky = getChild<LLSliderCtrl>("SkyMeshDetail"); LLTextBox* sky_text = getChild<LLTextBox>("SkyMeshDetailText"); + LLSliderCtrl* cas_slider = getChild<LLSliderCtrl>("RenderSharpness"); // disabled windlight if (!LLFeatureManager::getInstance()->isFeatureAvailable("WindLightUseAtmosShaders")) @@ -330,6 +331,7 @@ void LLFloaterPreferenceGraphicsAdvanced::disableUnavailableSettings() tonemapLabel->setEnabled(!is_vintage); tonemapMix->setEnabled(!is_vintage); exposureSlider->setEnabled(!is_vintage); + cas_slider->setEnabled(!is_vintage); } void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState() |