diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
3 files changed, 62 insertions, 43 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml index 5258bdbaf2..518a83f846 100644 --- a/indra/newview/skins/default/xui/en/floater_adjust_environment.xml +++ b/indra/newview/skins/default/xui/en/floater_adjust_environment.xml @@ -10,6 +10,8 @@ min_height="275" single_instance="true" can_resize="false"> + <string name="hdr_string">HDR Scale:</string> + <string name="brightness_string">Brightness:</string> <layout_stack name="outer_stack" width="845" height="275" @@ -245,25 +247,6 @@ top_pad="5" width="185" can_edit_text="true"/> - <text follows="left|top" - name="scene_gamma_label" - height="10" - layout="topleft" - left_delta="-5" - top_pad="15" - width="80">Brightness:</text> - <slider decimal_digits="2" - follows="left|top" - height="16" - increment="0.01" - initial_value="0" - layout="topleft" - left_delta="5" - max_val="20" - name="scene_gamma" - top_pad="5" - width="185" - can_edit_text="true"/> <text follows="left|top" height="10" layout="topleft" @@ -283,6 +266,25 @@ top_pad="5" width="185" can_edit_text="true"/> + <text follows="left|top" + name="scene_gamma_label" + height="10" + layout="topleft" + left_delta="-5" + top_pad="15" + width="80">Brightness:</text> + <slider decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + max_val="20" + name="scene_gamma" + top_pad="5" + width="185" + can_edit_text="true"/> </layout_panel> <layout_panel border="false" name="lp_3" 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 fd80673903..c1a94a2128 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 @@ -601,6 +601,20 @@ </check_box> <check_box + control_name="RenderSkyAutoAdjustLegacy" + height="16" + initial_value="true" + label="Auto-adjust Legacy Sky" + layout="topleft" + left="420" + name="AutoAdjustLegacySky" + top_delta="16" + width="240"> + <check_box.commit_callback + function="Pref.RenderOptionUpdate" /> + </check_box> + + <check_box control_name="RenderDepthOfField" height="16" initial_value="true" diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml index 58d125a88e..36a485e498 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml @@ -7,6 +7,8 @@ left="0" name="panel_settings_sky_atmos" top="0"> + <string name="hdr_string">HDR Scale:</string> + <string name="brightness_string">Brightness:</string> <layout_stack name="main_ls" follows="all" @@ -228,29 +230,6 @@ name="ice_level" width="207" can_edit_text="true"/> - <text - name="scene_gamma_label" - follows="left|top" - height="10" - layout="topleft" - left_delta="-5" - top_delta="25" - width="80"> - Brightness: - </text> - <slider - decimal_digits="2" - follows="left|top" - height="16" - increment="0.01" - initial_value="0" - layout="topleft" - left_delta="5" - max_val="20" - name="scene_gamma" - top_delta="20" - width="207" - can_edit_text="true"/> </layout_panel> <layout_panel name="right_lp" @@ -338,8 +317,9 @@ layout="topleft" left_delta="-5" top_delta="25" + tooltip="Irradiance control. When not zero, enables HDR lighting model." width="200"> - Reflection Probe Ambiance: + Reflection Probe Ambiance (HDR): </text> <slider decimal_digits="2" @@ -355,6 +335,29 @@ top_delta="20" width="219" can_edit_text="true"/> + <text + name="scene_gamma_label" + follows="left|top" + height="10" + layout="topleft" + left_delta="-5" + top_delta="25" + width="80"> + Brightness: + </text> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + max_val="20" + name="scene_gamma" + top_delta="20" + width="207" + can_edit_text="true"/> </layout_panel> </layout_stack> </layout_panel> |