diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-04-11 15:09:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-11 15:09:58 -0500 |
| commit | 2b2154f0217758b27b544d066024d922ba234d51 (patch) | |
| tree | fafed45d3e9cc21b04e2babf6bf19d1a476fc88a /indra/newview/skins/default | |
| parent | 474739226433a74cdca05a949586139a9c9c0bbd (diff) | |
SL-19564 Rebalance exposure and sky. Hack legacy diffuse map saturation and brightness to allow ACES Hill all the time.
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml | 36 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 32 |
2 files changed, 21 insertions, 47 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 17875e9c19..16b965843d 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 @@ -712,42 +712,6 @@ value="2"/> </combo_box> - - <text - type="string" - length="1" - follows="left|top" - height="16" - layout="topleft" - left="420" - name="RenderTonemapperText" - text_readonly_color="LabelDisabledColor" - top_delta="24" - width="128"> - Tonemapper: - </text> - <combo_box - control_name="RenderTonemapper" - height="18" - layout="topleft" - left_delta="130" - top_delta="0" - name="ToneMapper" - width="150"> - <combo_box.item - label="Linear" - name="0" - value="0"/> - <combo_box.item - label="ACES Narkowicz" - name="1" - value="1"/> - <combo_box.item - label="ACES Hill" - name="2" - value="2"/> - </combo_box> - <slider control_name="RenderExposure" decimal_digits="1" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index d77415877c..4a92bdc601 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -902,17 +902,27 @@ function="World.EnableEnvSettings" parameter="sunrise" /> </menu_item_check> - <menu_item_check - label="Midday" - name="Noon" - shortcut="control|shift|Y"> - <menu_item_check.on_click - function="World.EnvSettings" - parameter="noon" /> - <menu_item_check.on_check - function="World.EnableEnvSettings" - parameter="noon" /> - </menu_item_check> + <menu_item_check + label="Midday" + name="Noon" + shortcut="control|shift|Y"> + <menu_item_check.on_click + function="World.EnvSettings" + parameter="noon" /> + <menu_item_check.on_check + function="World.EnableEnvSettings" + parameter="noon" /> + </menu_item_check> + <menu_item_check + label="Midday (Legacy)" + name="legacy noon"> + <menu_item_check.on_click + function="World.EnvSettings" + parameter="legacy noon" /> + <menu_item_check.on_check + function="World.EnableEnvSettings" + parameter="legacy noon" /> + </menu_item_check> <menu_item_check label="Sunset" name="Sunset" |