Rename "Vintage Mode" to "HDR and Emissive" in advanced settings. (#3192)

#2590
#3167

8 files changed, 30 insertions, 31 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2d545fde07..65235b47af 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16071,16 +16071,16 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-    <key>RenderVintageMode</key>
+    <key>RenderDisableVintageMode</key>
     <map>
         <key>Comment</key>
-        <string>Disable different rendering pipeline features to improve performance on older machines that makes the world look closer to how it used to prior to V7.</string>
+        <string>Enables additional rendering pipeline features on newer machines such as HDR and emissive textures on PBR content.</string>
         <key>Persist</key>
         <integer>1</integer>
         <key>Type</key>
         <string>Boolean</string>
         <key>Value</key>
-        <integer>0</integer>
+        <integer>1</integer>
     </map>
 </map>
 </llsd>
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 01356c3949..920b197034 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -86,7 +86,7 @@ RenderTonemapType			1   1
 RenderTonemapMix			1   1
 RenderEnableEmissiveBuffer  1   1
 RenderHDREnabled            1   1
-RenderVintageMode           1   1
+RenderDisableVintageMode           1   1
 
 //
 // Low Graphics Settings
@@ -127,7 +127,7 @@ RenderCASSharpness          1   0
 RenderExposure				1   1
 RenderTonemapType			1   1
 RenderTonemapMix			1   0.7
-RenderVintageMode           1   1
+RenderDisableVintageMode           1   0
 
 //
 // Medium Low Graphics Settings
@@ -168,7 +168,7 @@ RenderCASSharpness          1   0
 RenderExposure				1   1
 RenderTonemapType			1   1
 RenderTonemapMix			1   0.7
-RenderVintageMode           1   1
+RenderDisableVintageMode           1   0
 
 //
 // Medium Graphics Settings (standard)
@@ -378,7 +378,7 @@ RenderShadowDetail			1	0
 RenderDeferredSSAO			1	0
 RenderMirrors				1	0
 RenderEnableEmissiveBuffer  1   0
-RenderVintageMode           1   1
+RenderDisableVintageMode           1   0
 
 //
 // VRAM > 512MB
@@ -401,7 +401,7 @@ RenderDeferredSSAO			0	0
 RenderShadowDetail			0	0
 RenderReflectionProbeDetail	0	-1
 RenderMirrors				0	0
-RenderVintageMode           1   1
+RenderDisableVintageMode           1   0
 
 list Intel
 RenderAnisotropic			1	0
@@ -424,7 +424,7 @@ RenderEnableEmissiveBuffer  1   0
 RenderGLMultiThreadedTextures 0 0
 RenderGLMultiThreadedMedia 0 0
 RenderHDREnabled            1   0
-RenderVintageMode           1   1
+RenderDisableVintageMode           1   0
 
 list TexUnit16orLess
 RenderTerrainPBRDetail      1   -1
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index 9688693850..b05e66fed6 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -1,4 +1,4 @@
-version 67
+version 68
 // The version number above should be incremented IF AND ONLY IF some
 // change has been made that is sufficiently important to justify
 // resetting the graphics preferences of all users to the recommended
@@ -83,7 +83,7 @@ RenderCASSharpness          1   1
 RenderExposure				1   1
 RenderTonemapType			1   1
 RenderTonemapMix			1   1
-RenderVintageMode           1   1
+RenderDisableVintageMode           1   1
 
 //
 // Low Graphics Settings
@@ -124,7 +124,7 @@ RenderCASSharpness          1   0
 RenderExposure				1   1
 RenderTonemapType			1   1
 RenderTonemapMix			1   0.7
-RenderVintageMode           1   1
+RenderDisableVintageMode           1   0
 
 //
 // Medium Low Graphics Settings
@@ -165,7 +165,7 @@ RenderCASSharpness          1   0
 RenderExposure				1   1
 RenderTonemapType			1   1
 RenderTonemapMix			1   0.7
-RenderVintageMode           1   1
+RenderDisableVintageMode           1   0
 
 //
 // Medium Graphics Settings (standard)
@@ -374,7 +374,7 @@ list Unknown
 RenderShadowDetail			1	0
 RenderDeferredSSAO			1	0
 RenderMirrors				1	0
-RenderVintageMode           1   1
+RenderDisableVintageMode           1   0
 
 
 //
@@ -396,7 +396,7 @@ RenderTerrainDetail 		1	0
 RenderDeferredSSAO			0	0
 RenderShadowDetail			0	0
 RenderMirrors				0	0
-RenderVintageMode           1   1
+RenderDisableVintageMode           1   0
 
 list TexUnit8orLess
 RenderDeferredSSAO			0	0
@@ -425,8 +425,7 @@ RenderFSAASamples           0   0
 RenderReflectionProbeDetail	0	0
 RenderReflectionsEnabled    0   0
 RenderMirrors				0	0
-RenderVintageMode           1   1
+RenderDisableVintageMode           1   0
 
 list VaryingVectors16orLess
 RenderTerrainPBRPlanarSampleCount 1   1
-
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 2adc6e4a29..ba54d93c75 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -719,7 +719,7 @@ void LLFeatureManager::applyBaseMasks()
         LLImageGLThread::sEnabledTextures = false;
 
         // Make extra sure that vintage mode also gets enabled.
-        gSavedSettings.setBOOL("RenderVintageMode", true);
+        gSavedSettings.setBOOL("RenderDisableVintageMode", false);
     }
     if (gGLManager.mMaxVaryingVectors <= 16)
     {
diff --git a/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp b/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
index 89ff9988a6..cc4ca611ab 100644
--- a/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
+++ b/indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
@@ -321,17 +321,17 @@ void LLFloaterPreferenceGraphicsAdvanced::disableUnavailableSettings()
     }
 
     // Vintage mode
-    LLCachedControl<bool> is_vintage(gSavedSettings, "RenderVintageMode");
+    LLCachedControl<bool> is_not_vintage(gSavedSettings, "RenderDisableVintageMode");
     LLSliderCtrl*         tonemapMix    = getChild<LLSliderCtrl>("TonemapMix");
     LLComboBox*           tonemapSelect = getChild<LLComboBox>("TonemapType");
     LLTextBox*            tonemapLabel  = getChild<LLTextBox>("TonemapTypeText");
     LLSliderCtrl*         exposureSlider = getChild<LLSliderCtrl>("RenderExposure");
 
-    tonemapSelect->setEnabled(!is_vintage);
-    tonemapLabel->setEnabled(!is_vintage);
-    tonemapMix->setEnabled(!is_vintage);
-    exposureSlider->setEnabled(!is_vintage);
-    cas_slider->setEnabled(!is_vintage);
+    tonemapSelect->setEnabled(is_not_vintage);
+    tonemapLabel->setEnabled(is_not_vintage);
+    tonemapMix->setEnabled(is_not_vintage);
+    exposureSlider->setEnabled(is_not_vintage);
+    cas_slider->setEnabled(is_not_vintage);
 }
 
 void LLFloaterPreferenceGraphicsAdvanced::refreshEnabledState()
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index c4afaac476..172ffcb0d4 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -248,10 +248,10 @@ static bool handleEnableEmissiveChanged(const LLSD& newvalue)
     return handleReleaseGLBufferChanged(newvalue) && handleSetShaderChanged(newvalue);
 }
 
-static bool handleEnableClassicMode(const LLSD& newvalue)
+static bool handleDisableVintageMode(const LLSD& newvalue)
 {
-    gSavedSettings.setBOOL("RenderEnableEmissiveBuffer", !newvalue.asBoolean());
-    gSavedSettings.setBOOL("RenderHDREnabled", !newvalue.asBoolean());
+    gSavedSettings.setBOOL("RenderEnableEmissiveBuffer", newvalue.asBoolean());
+    gSavedSettings.setBOOL("RenderHDREnabled", newvalue.asBoolean());
     return true;
 }
 
@@ -798,7 +798,7 @@ void settings_setup_listeners()
     setting_setup_signal_listener(gSavedSettings, "RenderGlowResolutionPow", handleReleaseGLBufferChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderGlowHDR", handleReleaseGLBufferChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderEnableEmissiveBuffer", handleEnableEmissiveChanged);
-    setting_setup_signal_listener(gSavedSettings, "RenderVintageMode", handleEnableClassicMode);
+    setting_setup_signal_listener(gSavedSettings, "RenderDisableVintageMode", handleDisableVintageMode);
     setting_setup_signal_listener(gSavedSettings, "RenderHDREnabled", handleEnableHDR);
     setting_setup_signal_listener(gSavedSettings, "RenderGlowNoise", handleSetShaderChanged);
     setting_setup_signal_listener(gSavedSettings, "RenderGammaFull", handleSetShaderChanged);
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 37972f2159..65b98c65cf 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -685,10 +685,10 @@
   </check_box>
 
     <check_box
-      control_name="RenderVintageMode"
+      control_name="RenderDisableVintageMode"
       height="16"
       initial_value="false"
-      label="Vintage Mode"
+      label="HDR and Emissive"
       layout="topleft"
       left="420"
       name="VintageMode"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index 1d4577f8ee..248cb04e6f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -327,7 +327,7 @@
 
   <slider
     control_name="RenderExposure"
-    disabled_control="RenderVintageMode"
+    enabled_control="RenderDisableVintageMode"
     decimal_digits="1"
     follows="left|top"
     height="16"