diff --git a/indra/newview/skins/default/xui/en/panel_lightbox_dof.xml b/indra/newview/skins/default/xui/en/panel_lightbox_dof.xml
index 420afdedc8a843f079be28ecb0bf3e3c0b02ce80..a2efb26a60e919242836f7be246b7da25285e58f 100644
--- a/indra/newview/skins/default/xui/en/panel_lightbox_dof.xml
+++ b/indra/newview/skins/default/xui/en/panel_lightbox_dof.xml
@@ -54,7 +54,7 @@
height="15"
left="30"
top_pad="4"
- width="130"
+ width="70"
layout="topleft"
tool_tip="(Default: 60) Vertical FoV for DoF calculations"
value="Field of View:" />
@@ -67,7 +67,7 @@
max_val="175"
min_val="10"
left="130"
- right="-68"
+ right="-75"
name="dof_fov_slider"
tool_tip="(Default: 60) Vertical FoV for DoF calculations"
control_name="CameraFieldOfView"/>
@@ -75,7 +75,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="0"
follows="top|right"
layout="topleft"
@@ -86,12 +86,26 @@
name="dof_fov_spinner"
tool_tip="(Default: 60) Vertical FoV for DoF calculations"
control_name="CameraFieldOfView"/>
+ <button
+ name="dofFOV_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="30"
- top_pad="8"
- width="130"
+ top_pad="3"
+ width="65"
layout="topleft"
tool_tip="(Default: f/9) Simulated camera apature f-value. Smaller f-stops result in a narrower focal range. Larger increases focal range."
value="Aperture (f):" />
@@ -104,7 +118,7 @@
max_val="256"
min_val="0.5"
left="130"
- right="-68"
+ right="-75"
name="dof_fstop_slider"
tool_tip="(Default: f/9) Simulated camera apature f-value. Smaller f-stops result in a narrower focal range. Larger increases focal range."
control_name="CameraFNumber"/>
@@ -112,7 +126,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="1"
follows="top|right"
layout="topleft"
@@ -123,12 +137,26 @@
name="dof_fstop_spinner"
tool_tip="(Default: f/9) Simulated camera apature f-value. Smaller f-stops result in a narrower focal range. Larger increases focal range."
control_name="CameraFNumber"/>
+ <button
+ name="dofFNumber_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="30"
- top_pad="8"
- width="130"
+ top_pad="3"
+ width="100"
layout="topleft"
tool_tip="(Default: 30mm) Focal length of simulated camera."
value="Focal Length (mm):" />
@@ -141,7 +169,7 @@
max_val="600"
min_val="10"
left="130"
- right="-68"
+ right="-75"
name="dof_length_slider"
tool_tip="(Default: 30mm) Focal length of simulated camera."
control_name="CameraFocalLength"/>
@@ -149,7 +177,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="0"
follows="top|right"
layout="topleft"
@@ -160,12 +188,26 @@
name="dof_length_spinner"
tool_tip="(Default: 30mm) Focal length of simulated camera."
control_name="CameraFocalLength"/>
+ <button
+ name="dofFocal_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="30"
- top_pad="8"
- width="130"
+ top_pad="3"
+ width="80"
layout="topleft"
tool_tip="(Default: 20) Circle of Confusion, blur intensity of out objects out of focus. This limits the amount of blur applied. High values produce softer out of focus objects, but can cause the viewer or system to become unresponsive"
value="CoC Maximum:" />
@@ -178,7 +220,7 @@
max_val="40"
min_val="0"
left="130"
- right="-68"
+ right="-75"
name="dof_coc_slider"
tool_tip="(Default: 20) Circle of Confusion, blur intensity of out objects out of focus. This limits the amount of blur applied. High values produce softer out of focus objects, but can cause the viewer or system to become unresponsive"
control_name="CameraMaxCoF"/>
@@ -186,7 +228,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="1"
follows="top|right"
layout="topleft"
@@ -197,12 +239,26 @@
name="dof_coc_spinner"
tool_tip="(Default: 20) Circle of Confusion, blur intensity of out objects out of focus. This limits the amount of blur applied. High values produce softer out of focus objects, but can cause the viewer or system to become unresponsive"
control_name="CameraMaxCoF"/>
+ <button
+ name="dofCOF_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="30"
- top_pad="8"
- width="130"
+ top_pad="3"
+ width="100"
layout="topleft"
tool_tip="(Default: 0.5s) Time it takes for the camera to transition to a new focal point."
value="Transition Time (s):" />
@@ -215,7 +271,7 @@
max_val="2"
min_val="0"
left="130"
- right="-68"
+ right="-75"
name="dof_focaltime_slider"
tool_tip="(Default: 0.5s) Time it takes for the camera to transition to a new focal point."
control_name="CameraFocusTransitionTime"/>
@@ -223,7 +279,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="1"
follows="top|right"
layout="topleft"
@@ -234,4 +290,18 @@
name="dof_focaltime_spinner"
tool_tip="(Default: 0.5s) Time it takes for the camera to transition to a new focal point."
control_name="CameraFocusTransitionTime"/>
+ <button
+ name="dofTime_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_lightbox_glow.xml b/indra/newview/skins/default/xui/en/panel_lightbox_glow.xml
index ed78bef662c4dda5a487c156c9fd397041ac556e..8365389f7de62aa0f4e04d4ff69d272347216869 100644
--- a/indra/newview/skins/default/xui/en/panel_lightbox_glow.xml
+++ b/indra/newview/skins/default/xui/en/panel_lightbox_glow.xml
@@ -3,7 +3,7 @@
class="glow_settings"
layout="topleft"
width="350"
- height="275"
+ height="150"
name="glow_settings">
<check_box
follows="left|top"
@@ -33,7 +33,7 @@
max_val="10"
min_val="1"
left="140"
- right="-68"
+ right="-75"
name="glow_iteration_slider"
tool_tip="(Default: 2) How many passes of the glow shader to use. More passes makes it overall stronger, softer, wider, and slower to render."
control_name="RenderGlowIterations"/>
@@ -41,7 +41,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="0"
follows="top|right"
layout="topleft"
@@ -52,11 +52,25 @@
name="glow_iteration_spinner"
tool_tip="(Default: 2) How many passes of the glow shader to use. More passes makes it overall stronger, softer, wider, and slower to render."
control_name="RenderGlowIterations"/>
+ <button
+ name="glowIteration_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="30"
- top_pad="8"
+ top_pad="3"
width="130"
layout="topleft"
tool_tip="(Default: 9) Overall resolution of glow. Higher values allow for wider glow. Use in conjunction with other glow settings for best effect."
@@ -70,7 +84,7 @@
max_val="10"
min_val="0"
left="140"
- right="-68"
+ right="-75"
name="glow_resPow_slider"
tool_tip="(Default: 9) Overall resolution of glow. Higher values allow for wider glow. Use in conjunction with other glow settings for best effect."
control_name="RenderGlowResolutionPow"/>
@@ -78,7 +92,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="0"
follows="top|right"
layout="topleft"
@@ -89,11 +103,25 @@
name="glow_resPow_spinner"
tool_tip="(Default: 9) Overall resolution of glow. Higher values allow for wider glow. Use in conjunction with other glow settings for best effect."
control_name="RenderGlowResolutionPow"/>
+ <button
+ name="glowRes_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="30"
- top_pad="8"
+ top_pad="3"
width="130"
layout="topleft"
tool_tip="(Default: .350) Overall strength of the glow shader."
@@ -107,7 +135,7 @@
max_val="1"
min_val="0"
left="140"
- right="-68"
+ right="-75"
name="glow_strength_slider"
tool_tip="(Default: .350) Overall strength of the glow shader."
control_name="RenderGlowStrength"/>
@@ -115,7 +143,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="3"
follows="top|right"
layout="topleft"
@@ -126,11 +154,25 @@
name="glow_strength_spinner"
tool_tip="(Default: .350) Overall strength of the glow shader."
control_name="RenderGlowStrength"/>
+ <button
+ name="glowStrength_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="30"
- top_pad="8"
+ top_pad="3"
width="130"
layout="topleft"
tool_tip="(Default: 1.3) Softness or width of glow, eventually gets pixelated at higher sizes."
@@ -144,7 +186,7 @@
max_val="10"
min_val="0"
left="140"
- right="-68"
+ right="-75"
name="glow_width_slider"
tool_tip="(Default: 1.3) Softness or width of glow, eventually gets pixelated at higher sizes."
control_name="RenderGlowWidth"/>
@@ -152,7 +194,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="2"
follows="top|right"
layout="topleft"
@@ -163,11 +205,25 @@
name="glow_width_spinner"
tool_tip="(Default: 1.3) Softness or width of glow, eventually gets pixelated at higher sizes."
control_name="RenderGlowWidth"/>
+ <button
+ name="glowWidth_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="30"
- top_pad="8"
+ top_pad="3"
width="130"
layout="topleft"
tool_tip="(Default: 1) Also called Minmum Luminance, how bright an object must be before it starts to automatically glow. 1 = Never"
@@ -181,7 +237,7 @@
max_val="1"
min_val="0"
left="140"
- right="-68"
+ right="-75"
name="glow_minLum_slider"
tool_tip="(Default: 1) Also called Minmum Luminance, how bright an object must be before it starts to automatically glow. 1 = Never"
control_name="RenderGlowMinLuminance"/>
@@ -189,7 +245,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="2"
follows="top|right"
layout="topleft"
@@ -200,11 +256,25 @@
name="glow_minLum_spinner"
tool_tip="(Default: 1) Also called Minmum Luminance, how bright an object must be before it starts to automatically glow. 1 = Never"
control_name="RenderGlowMinLuminance"/>
+ <button
+ name="glowMinLum_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="30"
- top_pad="8"
+ top_pad="3"
width="130"
layout="topleft"
tool_tip="(Default: 0.25) Also called Max Extract Alpha, controls strength of autoglow."
@@ -218,7 +288,7 @@
max_val="1"
min_val="0"
left="140"
- right="-68"
+ right="-75"
name="glow_maxExtractAlpha_slider"
tool_tip="(Default: 0.25) Also called Max Extract Alpha, controls strength of autoglow."
control_name="RenderGlowMaxExtractAlpha"/>
@@ -226,7 +296,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="2"
follows="top|right"
layout="topleft"
@@ -237,5 +307,18 @@
name="glow_maxExtractAlpha_spinner"
tool_tip="(Default: 0.25) Also called Max Extract Alpha, controls strength of autoglow."
control_name="RenderGlowMaxExtractAlpha"/>
-
+ <button
+ name="glowMaxAlpha_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_lightbox_image.xml b/indra/newview/skins/default/xui/en/panel_lightbox_image.xml
index b348aa253d0b619ab2092fbf5af5164484e504b9..8bcfc6728c795e3374b0d97b5f1463f6c2f62e9e 100644
--- a/indra/newview/skins/default/xui/en/panel_lightbox_image.xml
+++ b/indra/newview/skins/default/xui/en/panel_lightbox_image.xml
@@ -4,28 +4,29 @@
layout="topleft"
width="300"
height="175"
- name="colortone_settings">
+ name="colortone_settings"
+ can_resize="true">
<text
- follows="left|top"
+ follows="top"
+ layout="top"
height="15"
- left="10"
+ left_delta="10"
top_pad="4"
- width="110"
- layout="topleft"
+ width="70"
tool_tip="Controls SMAA Quality"
value="Anti-Aliasing:" />
<combo_box
+ follows="top|left"
+ layout="topleft"
+ height="16"
+ width="95"
+ left_delta="120"
+ top_pad="-16"
+ max_chars="128"
allow_text_entry="false"
tool_tip="Controls SMAA Quality"
control_name="RenderFSAASamples"
- follows="left|top"
- height="16"
- layout="topleft"
- left="130"
- max_chars="128"
- name="smaa_combo"
- top_pad="-16"
- width="95">
+ name="smaa_combo">
<combo_box.item
label="Disable"
name="smaa_off"
@@ -94,7 +95,7 @@
height="15"
left="10"
top_pad="4"
- width="130"
+ width="90"
layout="topleft"
tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale. Sharpening interacts poorly with this setting, disable it for best results."
value="Resolution Scale:" />
@@ -106,8 +107,8 @@
layout="topleft"
max_val="2"
min_val="0.1"
- left="90"
- right="-68"
+ left="100"
+ right="-75"
name="resMult_slider"
tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale. Sharpening interacts poorly with this setting, disable it for best results."
control_name="RenderResolutionMultiplier"/>
@@ -115,7 +116,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="1"
follows="top|right"
layout="topleft"
@@ -126,11 +127,25 @@
name="resMult_spinner"
tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale. Sharpening interacts poorly with this setting, disable it for best results."
control_name="RenderResolutionMultiplier"/>
+ <button
+ name="resMult_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="10"
- top_pad="4"
+ top_pad="2"
width="75"
layout="topleft"
tool_tip="(Default: Uchimura) Which algorithm should translate HDR values to SDR Colorspace"
@@ -189,7 +204,7 @@
height="15"
left="30"
top_pad="4"
- width="130"
+ width="55"
layout="topleft"
tool_tip="(Default: 1.0) Adjusts the overall brightness of the image via the Tonemapper"
value="Exposure:" />
@@ -201,8 +216,8 @@
layout="topleft"
max_val="16.0"
min_val="0.1"
- left="90"
- right="-68"
+ left="100"
+ right="-75"
name="exposure_slider"
tool_tip="(Default: 1.0) Adjusts the overall brightness of the image via the Tonemapper"
control_name="RenderToneMapExposure"/>
@@ -210,7 +225,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="1"
follows="top|right"
layout="topleft"
@@ -221,12 +236,26 @@
name="exposure_spinner"
tool_tip="(Default: 1.0) Adjusts the overall brightness of the image via the Tonemapper"
control_name="RenderToneMapExposure"/>
+ <button
+ name="exposure_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="10"
- top_pad="12"
- width="75"
+ top_pad="2"
+ width="60"
layout="topleft"
tool_tip="What Colorgrading LUT (Look Up Texture) to be used to colorgrade the image. Custom LUTs require the full filename!"
value="Active LUT:" />
@@ -235,13 +264,13 @@
tool_tip="What Colorgrading LUT (Look Up Texture) to be used to colorgrade the image. Custom LUTs require the full filename!"
control_name="RenderColorGradeLUT"
follows="left|top"
- height="18"
+ height="15"
layout="topleft"
- right="-10"
+ right="-20"
max_chars="200"
name="colorlut_combo"
- top_pad="-18"
- width="205">
+ top_pad="-15"
+ width="180">
<combo_box.item
label="Neutral"
name="lut_neutral"
@@ -305,7 +334,7 @@
<combo_box.item
label="Sinner 1"
name="lut_sinner1"
- value="Sinner1.png" />
+ value="Sinner.png" />
<combo_box.item
label="Sinner 2"
name="lut_sinner2"
@@ -382,7 +411,7 @@
height="15"
left="30"
top_pad="4"
- width="130"
+ width="50"
layout="topleft"
tool_tip="NOT YET IMPLEMENTED!"
value="Strength:" />
@@ -395,8 +424,8 @@
layout="topleft"
max_val="1"
min_val="0"
- left="90"
- right="-68"
+ left="100"
+ right="-75"
name="sharp_strength_slider"
tool_tip="NOT YET IMPLEMENTED!"
control_name=""/>
@@ -405,7 +434,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="1"
follows="top|right"
layout="topleft"
@@ -416,4 +445,18 @@
name="sharp_strength_spinner"
tool_tip="NOT YET IMPLEMENTED!"
control_name=""/>
+ <button
+ name="sharpen_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_lightbox_shadow.xml b/indra/newview/skins/default/xui/en/panel_lightbox_shadow.xml
index a3e75924aabb227fa8d436015bf47b8cbe490f8e..2f8598de6a86a219730473d76b5c3e50e98d53e3 100644
--- a/indra/newview/skins/default/xui/en/panel_lightbox_shadow.xml
+++ b/indra/newview/skins/default/xui/en/panel_lightbox_shadow.xml
@@ -85,8 +85,8 @@
follows="left|top"
height="15"
left="30"
- top_pad="4"
- width="130"
+ top_pad="3"
+ width="70"
layout="topleft"
tool_tip="(Default: -0.03) Reduces self-shadowing errors by ignoring faces too close to the shadow's origins. Smaller values allow more fine/accurate shadows at the cost of more shadow errors."
value="Shadow Bias:" />
@@ -99,7 +99,7 @@
max_val="0"
min_val="-0.01"
left="140"
- right="-68"
+ right="-75"
name="shadow_bias_slider"
tool_tip="(Default: -0.03) Reduces self-shadowing errors by ignoring faces too close to the shadow's origins. Smaller values allow more fine/accurate shadows at the cost of more shadow errors."
control_name="RenderShadowBias"/>
@@ -107,7 +107,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="3"
follows="top|right"
layout="topleft"
@@ -118,12 +118,26 @@
name="shadow_bias_spinner"
tool_tip="(Default: -0.03) Reduces self-shadowing errors by ignoring faces too close to the shadow's origins. Smaller values allow more fine/accurate shadows at the cost of more shadow errors."
control_name="RenderShadowBias"/>
+ <button
+ name="shadowBias_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="30"
- top_pad="8"
- width="130"
+ top_pad="3"
+ width="80"
layout="topleft"
tool_tip="(Default: -0.01) Used to reduce shadow errors by offsetting the entire shadowmap. Smaller values allow more accurate shadows and less light bleed from thin objects at the cost of possible shadow errors at extreme angles from source."
value="Shadow Offset:" />
@@ -136,7 +150,7 @@
max_val="0.05"
min_val="0"
left="140"
- right="-68"
+ right="-75"
name="shadow_offset_slider"
tool_tip="(Default: -0.01) Used to reduce shadow errors by offsetting the entire shadowmap. Smaller values allow more accurate shadows and less light bleed from thin objects at the cost of possible shadow errors at extreme angles from source."
control_name="RenderShadowOffset"/>
@@ -144,7 +158,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="3"
follows="top|right"
layout="topleft"
@@ -155,12 +169,26 @@
name="shadow_offset_spinner"
tool_tip="(Default: -0.01) Used to reduce shadow errors by offsetting the entire shadowmap. Smaller values allow more accurate shadows and less light bleed from thin objects at the cost of possible shadow errors at extreme angles from source."
control_name="RenderShadowOffset"/>
+ <button
+ name="shadowOffset_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="30"
- top_pad="8"
- width="130"
+ top_pad="3"
+ width="90"
layout="topleft"
tool_tip="(Default: 0.0) Reduces self-shadowing errors by ignoring faces too close to the shadow's origins. Smaller values allow more fine/accurate shadows at the cost of more shadow errors."
value="Spot Shadow Bias:" />
@@ -173,7 +201,7 @@
max_val="0"
min_val="-0.01"
left="140"
- right="-68"
+ right="-75"
name="shadow_spotbias_slider"
tool_tip="(Default: 0.0) Reduces self-shadowing errors by ignoring faces too close to the shadow's origins. Smaller values allow more fine/accurate shadows at the cost of more shadow errors."
control_name="RenderSpotShadowBias"/>
@@ -181,7 +209,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="3"
follows="top|right"
layout="topleft"
@@ -192,12 +220,26 @@
name="shadow_spotbias_spinner"
tool_tip="(Default: 0.0) Reduces self-shadowing errors by ignoring faces too close to the shadow's origins. Smaller values allow more fine/accurate shadows at the cost of more shadow errors."
control_name="RenderSpotShadowBias"/>
+ <button
+ name="spotBias_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="30"
- top_pad="8"
- width="130"
+ top_pad="3"
+ width="105"
layout="topleft"
tool_tip="(Default: 0.15) Used to reduce shadow errors by offsetting the entire projector shadowmap. Smaller values allow more accurate shadows and less light bleed from thin objects at the cost of possible shadow errors at extreme angles from source."
value="Spot Shadow Offset:" />
@@ -210,7 +252,7 @@
max_val="0.15"
min_val="0"
left="140"
- right="-68"
+ right="-75"
name="shadow_spotoffset_slider"
tool_tip="(Default: 0.15) Used to reduce shadow errors by offsetting the entire projector shadowmap. Smaller values allow more accurate shadows and less light bleed from thin objects at the cost of possible shadow errors at extreme angles from source."
control_name="RenderSpotShadowOffset"/>
@@ -218,7 +260,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="3"
follows="top|right"
layout="topleft"
@@ -229,12 +271,26 @@
name="shadow_spotoffset_spinner"
tool_tip="(Default: 0.15) Used to reduce shadow errors by offsetting the entire projector shadowmap. Smaller values allow more accurate shadows and less light bleed from thin objects at the cost of possible shadow errors at extreme angles from source."
control_name="RenderSpotShadowOffset"/>
+ <button
+ name="spotOffset_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="30"
- top_pad="8"
- width="130"
+ top_pad="3"
+ width="70"
layout="topleft"
tool_tip="(Default: 3.0) Controls both Shadow and SSAO blurring. Low values may cause SSAO noise to become apparent."
value="Shadow Blur:" />
@@ -247,7 +303,7 @@
max_val="5.0"
min_val="0"
left="140"
- right="-68"
+ right="-75"
name="shadow_blur_slider"
tool_tip="(Default: 3.0) Controls both Shadow and SSAO blurring. Low values may cause SSAO noise to become apparent."
control_name="RenderShadowBlurSize"/>
@@ -255,7 +311,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="1"
follows="top|right"
layout="topleft"
@@ -266,12 +322,26 @@
name="shadow_blur_spinner"
tool_tip="(Default: 3.0) Controls both Shadow and SSAO blurring. Low values may cause SSAO noise to become apparent."
control_name="RenderShadowBlurSize"/>
+ <button
+ name="blur_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="30"
- top_pad="8"
- width="130"
+ top_pad="3"
+ width="75"
layout="topleft"
tool_tip="(Default: 0.0) Controls how far away from the camera should blurring occur. Larger values reduce blur near the camera. Try using this for shadow sharpening if you encounter SSAO noise when lowering Shadow Blur!"
value="Blur Distance:" />
@@ -284,7 +354,7 @@
max_val="3.0"
min_val="0"
left="140"
- right="-68"
+ right="-75"
name="shadow_blurdist_slider"
tool_tip="(Default: 0.0) Controls how far away from the camera should blurring occur. Larger values reduce blur near the camera. Try using this for shadow sharpening if you encounter SSAO noise when lowering Shadow Blur!"
control_name="RenderShadowBlurDistFactor"/>
@@ -292,7 +362,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="1"
follows="top|right"
layout="topleft"
@@ -303,6 +373,20 @@
name="shadow_blurdist_spinner"
tool_tip="(Default: 0.0) Controls how far away from the camera should blurring occur. Larger values reduce blur near the camera. Try using this for shadow sharpening if you encounter SSAO noise when lowering Shadow Blur!"
control_name="RenderShadowBlurDistFactor"/>
+ <button
+ name="blurdist_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<panel
label="SSAO"
name="ssao_panel"
diff --git a/indra/newview/skins/default/xui/en/panel_lightbox_ssao.xml b/indra/newview/skins/default/xui/en/panel_lightbox_ssao.xml
index bd89f665ed534046217149e7c1d4466bd06113d0..138065e61fa1157e5b05de4d42a6f1ace5906e7c 100644
--- a/indra/newview/skins/default/xui/en/panel_lightbox_ssao.xml
+++ b/indra/newview/skins/default/xui/en/panel_lightbox_ssao.xml
@@ -35,7 +35,7 @@
max_val="1"
min_val="-1"
left="140"
- right="-68"
+ right="-75"
name="ssao_strength_slider"
tool_tip="NYI!"
control_name=""/>
@@ -44,7 +44,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="1"
follows="top|right"
layout="topleft"
@@ -55,11 +55,25 @@
name="ssao_strength_spinner"
tool_tip="NYI!"
control_name=""/>
+ <button
+ name="ssaoStrength_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="30"
- top_pad="8"
+ top_pad="3"
width="130"
layout="topleft"
tool_tip="(Default: 5.0) Occlusion sensitivity factor, larger = more."
@@ -73,7 +87,7 @@
max_val="10"
min_val="0"
left="140"
- right="-68"
+ right="-75"
name="ssao_factor_slider"
tool_tip="(Default: 5.0) Occlusion sensitivity factor, larger = more."
control_name="RenderSSAOFactor"/>
@@ -81,7 +95,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="1"
follows="top|right"
layout="topleft"
@@ -92,11 +106,25 @@
name="ssao_factor_spinner"
tool_tip="(Default: 5.0) Occlusion sensitivity factor, larger = more."
control_name="RenderSSAOFactor"/>
+ <button
+ name="ssaoFactor_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="30"
- top_pad="8"
+ top_pad="3"
width="130"
layout="topleft"
tool_tip="(Default: 1500) Determines distance from surface to check for occlusion. Higher = Wider occlusion NOTE: Large values may produce artifacts."
@@ -110,7 +138,7 @@
max_val="5000"
min_val="0"
left="140"
- right="-68"
+ right="-75"
name="ssao_scale_slider"
tool_tip="(Default: 1500) Determines distance from surface to check for occlusion. Higher = Wider occlusion NOTE: Large values may produce artifacts."
control_name="RenderSSAOScale"/>
@@ -118,7 +146,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="0"
follows="top|right"
layout="topleft"
@@ -129,11 +157,25 @@
name="ssao_scale_spinner"
tool_tip="(Default: 1500) Determines distance from surface to check for occlusion. Higher = Wider occlusion NOTE: Large values may produce artifacts."
control_name="RenderSSAOScale"/>
+ <button
+ name="ssaoScale_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
<text
follows="left|top"
height="15"
left="30"
- top_pad="8"
+ top_pad="3"
width="130"
layout="topleft"
tool_tip="(Default: 400) Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
@@ -147,7 +189,7 @@
max_val="1000"
min_val="0"
left="140"
- right="-68"
+ right="-75"
name="ssao_maxScale_slider"
tool_tip="(Default: 400) Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
control_name="RenderSSAOMaxScale"/>
@@ -155,7 +197,7 @@
top_pad="-20"
height="15"
label_width="0"
- right="-8"
+ right="-20"
decimal_digits="0"
follows="top|right"
layout="topleft"
@@ -166,4 +208,18 @@
name="ssao_maxScale_spinner"
tool_tip="(Default: 400) Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
control_name="RenderSSAOMaxScale"/>
+ <button
+ name="ssaoMaxScale_default_btn"
+ follows="top|right"
+ layout="topleft"
+ height="22"
+ left_delta="55"
+ top_pad="-15"
+ width="18"
+ scale_image="true"
+ image_overlay="Refresh_Off"
+ image_overlay_alignment="center">
+ <button.commit_callback
+ function="ClickDefault" />
+ </button>
</panel>