diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-12-06 14:03:46 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-12-06 14:03:46 +0800 |
| commit | 70e36b3ff4673888a951f1f3487176ec3ca44fe5 (patch) | |
| tree | 1fffba9d0bc5a643bfa388e7ccae54332bbd4a25 /indra/newview/skins/default | |
| parent | fda6acb4be1145ac1dc6c33859d8a65dcfa8aecb (diff) | |
| parent | 37f92c1698cd0cef1aa3d8a21a13cd99510e86e9 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 2 |
2 files changed, 3 insertions, 3 deletions
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 aeaa8370ac..d58107690d 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 b4b4bb6fd3..7481e10ed2 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -361,7 +361,7 @@ <slider control_name="RenderExposure" - disabled_control="RenderVintageMode" + enabled_control="RenderDisableVintageMode" decimal_digits="1" follows="left|top" height="16" |