diff --git a/indra/newview/skins/default/xui/en/floater_lightbox_settings.xml b/indra/newview/skins/default/xui/en/floater_lightbox_settings.xml
index 915441231e3da627e2709037569522dd72a788f1..1a0afb23b92c02e1d2c9242e412cabab2453e781 100644
--- a/indra/newview/skins/default/xui/en/floater_lightbox_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_lightbox_settings.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
- width="300"
+ width="350"
height="300"
layout="topleft"
min_height="300"
- min_width="300"
+ min_width="350"
name="floater_lightbox_settings"
positioning="cascading"
title="LIGHTBOX SETTINGS"
save_rect="true"
- can_resize="true"
+ can_resize="false"
can_resize_height="false">
<tab_container
top_pad="0"
@@ -21,23 +21,23 @@
name="lightbox_tab_container"
tab_position="top"
tab_stop="false"
- width="300">
+ width="350">
<panel
- label="Image Enhancement"
+ label="Image"
name="colortone_panel"
class="colortone_panel"
filename="panel_lightbox_image.xml"
layout="topleft"
follows="all" />
<panel
- label="Depth of Field"
+ label="DoF"
name="dof_panel"
class="dof_panel"
filename="panel_lightbox_dof.xml"
layout="topleft"
follows="all" />
<panel
- label="Shadows + SSAO"
+ label="Shadows/SSAO"
name="shadow_panel"
class="shadow_panel"
filename="panel_lightbox_shadow.xml"
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 3f6bb8f81a01d9190ff9426704e48973de335087..9e023f4f71855899167e0db9027f815bc43dc0e9 100644
--- a/indra/newview/skins/default/xui/en/panel_lightbox_dof.xml
+++ b/indra/newview/skins/default/xui/en/panel_lightbox_dof.xml
@@ -5,15 +5,6 @@
width="300"
height="175"
name="dof_settings">
- <text
- follows="left|top"
- height="15"
- left="10"
- top_pad="4"
- width="300"
- layout="topleft"
- tool_tip="NYI!"
- value="NOT YET IMPLEMENTED!" />
<check_box
follows="left|top"
height="15"
@@ -21,139 +12,225 @@
top_pad="4"
width="80"
layout="topleft"
- label="Use Depth Of Field"
- control_name="RenderDepthOfField"
- />
- <check_box
+ label="Depth of Field"
+ tool_tip="Toggles Depth of Field"
+ control_name="RenderDepthOfField"/>
+ <text
+ follows="left|top"
+ height="15"
+ left="30"
+ top_pad="4"
+ width="80"
+ layout="topleft"
+ tool_tip="(Default: Half) What fraction of screen resolution should be used for rendering Depth of Field. NOTE: Viewer may become unresponsive if DoF becomes intense when Full Resolution is used."
+ value="DoF Resolution: " />
+ <combo_box
+ allow_text_entry="false"
+ tool_tip="(Default: Half) What fraction of screen resolution should be used for rendering Depth of Field. NOTE: Viewer may become unresponsive if DoF becomes intense when Full Resolution is used."
+ control_name="CameraDoFResScale"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="120"
+ max_chars="128"
+ name="dof_res_combo"
+ top_pad="-16"
+ width="70">
+ <combo_box.item
+ label="Quarter"
+ name="dof_quarterres"
+ value="0.25" />
+ <combo_box.item
+ label="Half"
+ name="dof_halfres"
+ value="0.5" />
+ <combo_box.item
+ label="Full"
+ name="dof_fullres"
+ value="1.0" />
+ </combo_box>
+ <text
follows="left|top"
height="15"
- left="24"
+ left="30"
top_pad="4"
- width="80"
+ width="130"
layout="topleft"
- label="Allow foreground blurring"
- control_name="RenderDOFallowForeground"
- />
- <check_box
+ tool_tip="(Default: 60) Vertical FoV for DoF calculations"
+ value="Field of View:" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment="1"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="175"
+ min_val="10"
+ left="130"
+ right="-68"
+ name="dof_fov_slider"
+ tool_tip="(Default: 60) Vertical FoV for DoF calculations"
+ control_name="CameraFieldOfView"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-8"
+ decimal_digits="0"
+ follows="top|right"
+ layout="topleft"
+ max_val="175"
+ min_val="10"
+ width="55"
+ increment="1"
+ name="dof_fov_spinner"
+ tool_tip="(Default: 60) Vertical FoV for DoF calculations"
+ control_name="CameraFieldOfView"/>
+ <text
follows="left|top"
height="15"
- left="24"
- top_pad="4"
- width="80"
+ left="30"
+ top_pad="8"
+ width="130"
+ 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):" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment=".1"
+ follows="left|top|right"
layout="topleft"
- label="Include Transparent Objects"
- control_name="RenderDOFallowTransparent"
- />
+ max_val="256"
+ min_val="0.5"
+ left="130"
+ right="-68"
+ 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"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-8"
+ decimal_digits="1"
+ follows="top|right"
+ layout="topleft"
+ max_val="256"
+ min_val="0.5"
+ width="55"
+ increment=".1"
+ 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"/>
<text
- follows="left|top"
- height="15"
- left="30"
- top_pad="4"
- width="130"
- layout="topleft"
- tool_tip="NYI!"
- value="Focal Length (mm):" />
+ follows="left|top"
+ height="15"
+ left="30"
+ top_pad="8"
+ width="130"
+ layout="topleft"
+ tool_tip="(Default: 30mm) Focal length of simulated camera."
+ value="Focal Length (mm):" />
<slider_bar
- top_pad="-18"
- height="20"
- increment="10"
- follows="left|top|right"
- layout="topleft"
- max_val="100"
- min_val="10"
- left="140"
- right="-68"
- name="dof_focallength_slider"
- tool_tip="NYI!"
- control_name="RenderDOFFocalLength"/>
+ top_pad="-18"
+ height="20"
+ increment="5"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="600"
+ min_val="10"
+ left="130"
+ right="-68"
+ name="dof_length_slider"
+ tool_tip="(Default: 30mm) Focal length of simulated camera."
+ control_name="CameraFocalLength"/>
<spinner
- top_pad="-20"
- height="15"
- label_width="0"
- right="-8"
- decimal_digits="0"
- follows="top|right"
- layout="topleft"
- max_val="100"
- min_val="10"
- width="55"
- increment="10"
- name="dof_focallength_spinner"
- tool_tip="NYI!"
- control_name="RenderDOFFocalLength"/>
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-8"
+ decimal_digits="0"
+ follows="top|right"
+ layout="topleft"
+ max_val="600"
+ min_val="10"
+ width="55"
+ increment="5"
+ name="dof_length_spinner"
+ tool_tip="(Default: 30mm) Focal length of simulated camera."
+ control_name="CameraFocalLength"/>
<text
- follows="left|top"
- height="15"
- left="30"
- top_pad="8"
- width="130"
- layout="topleft"
- tool_tip="NYI!"
- value="Aperture (fStop):" />
+ follows="left|top"
+ height="15"
+ left="30"
+ top_pad="8"
+ width="130"
+ 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:" />
<slider_bar
- top_pad="-18"
- height="20"
- increment=".1"
- follows="left|top|right"
- layout="topleft"
- max_val="22"
- min_val="1"
- left="140"
- right="-68"
- name="dof_fstop_slider"
- tool_tip="NYI!"
- control_name="RenderDOFfStop"/>
+ top_pad="-18"
+ height="20"
+ increment=".5"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="40"
+ min_val="0"
+ left="130"
+ right="-68"
+ 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"/>
<spinner
- top_pad="-20"
- height="15"
- label_width="0"
- right="-8"
- decimal_digits="1"
- follows="top|right"
- layout="topleft"
- max_val="22"
- min_val="1"
- width="55"
- increment=".1"
- name="dof_fstop_spinner"
- tool_tip="NYI!"
- control_name="RenderDOFfStop"/>
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-8"
+ decimal_digits="1"
+ follows="top|right"
+ layout="topleft"
+ max_val="40"
+ min_val="0"
+ width="55"
+ increment=".5"
+ 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"/>
<text
- follows="left|top"
- height="15"
- left="30"
- top_pad="8"
- width="130"
- layout="topleft"
- tool_tip="NYI!"
- value="Circle of Confusion:" />
+ follows="left|top"
+ height="15"
+ left="30"
+ top_pad="8"
+ width="130"
+ layout="topleft"
+ tool_tip="(Default: 0.5s) Time it takes for the camera to transition to a new focal point."
+ value="Transition Time (s):" />
<slider_bar
- top_pad="-18"
- height="20"
- increment=".1"
- follows="left|top|right"
- layout="topleft"
- max_val="22"
- min_val="1"
- left="140"
- right="-68"
- name="dof_coc_slider"
- tool_tip="NYI!"
- control_name="RenderDOFcoc"/>
+ top_pad="-18"
+ height="20"
+ increment=".1"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="2"
+ min_val="0"
+ left="130"
+ right="-68"
+ 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"/>
<spinner
- top_pad="-20"
- height="15"
- label_width="0"
- right="-8"
- decimal_digits="1"
- follows="top|right"
- layout="topleft"
- max_val="22"
- min_val="1"
- width="55"
- increment=".1"
- name="dof_coc_spinner"
- tool_tip="NYI!"
- control_name="RenderDOFcoc"/>
-
-</panel>
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-8"
+ decimal_digits="1"
+ follows="top|right"
+ layout="topleft"
+ max_val="2"
+ min_val="0"
+ width="55"
+ increment=".1"
+ 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"/>
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 f4d712a076c0a182ade41a11854e3bc022d386e6..fb65a65a1d698a8be694e8622792dc3f5fa797ae 100644
--- a/indra/newview/skins/default/xui/en/panel_lightbox_image.xml
+++ b/indra/newview/skins/default/xui/en/panel_lightbox_image.xml
@@ -96,11 +96,11 @@
top_pad="4"
width="75"
layout="topleft"
- tool_tip="Which algorithm should translate HDR values to SDR Colorspace"
+ tool_tip="(Default: Uchimura) Which algorithm should translate HDR values to SDR Colorspace"
value="Tonemapper:" />
<combo_box
allow_text_entry="false"
- tool_tip="Which algorithm should translate HDR values to SDR Colorspace"
+ tool_tip="(Default: Uchimura) Which algorithm should translate HDR values to SDR Colorspace"
control_name="RenderToneMapType"
follows="left|top"
height="16"
@@ -154,7 +154,7 @@
top_pad="4"
width="130"
layout="topleft"
- tool_tip="Adjusts the overall brightness of the image via the Tonemapper"
+ tool_tip="(Default: 1.0) Adjusts the overall brightness of the image via the Tonemapper"
value="Exposure:" />
<slider_bar
top_pad="-18"
@@ -167,7 +167,7 @@
left="90"
right="-68"
name="exposure_slider"
- tool_tip="Adjusts the overall brightness of the image via the Tonemapper"
+ tool_tip="(Default: 1.0) Adjusts the overall brightness of the image via the Tonemapper"
control_name="RenderToneMapExposure"/>
<spinner
top_pad="-20"
@@ -182,7 +182,7 @@
width="55"
increment=".1"
name="exposure_spinner"
- tool_tip="Adjusts the overall brightness of the image via the Tonemapper"
+ tool_tip="(Default: 1.0) Adjusts the overall brightness of the image via the Tonemapper"
control_name="RenderToneMapExposure"/>
<text
follows="left|top"
@@ -350,6 +350,7 @@
tool_tip="NOT YET IMPLEMENTED!"
value="Strength:" />
<slider_bar
+ enabled="false"
top_pad="-18"
height="20"
increment=".1"
@@ -363,6 +364,7 @@
tool_tip="NOT YET IMPLEMENTED!"
control_name=""/>
<spinner
+ enabled="false"
top_pad="-20"
height="15"
label_width="0"
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 d8ced1ae15d880e2887be66332fcf2d43eccb83d..a3e75924aabb227fa8d436015bf47b8cbe490f8e 100644
--- a/indra/newview/skins/default/xui/en/panel_lightbox_shadow.xml
+++ b/indra/newview/skins/default/xui/en/panel_lightbox_shadow.xml
@@ -2,8 +2,8 @@
<panel
class="shadow_settings"
layout="topleft"
- width="300"
- height="175"
+ width="350"
+ height="275"
name="shadow_settings">
<text
follows="left|top"
@@ -46,11 +46,11 @@
top_pad="4"
width="90"
layout="topleft"
- tool_tip="Controls how detailed shadows are. Settings above 'Medium' are extremely demanding!"
+ tool_tip="(Default: Medium) Controls how detailed shadows are. Settings above 'Medium' are extremely demanding!"
value="Shadow Quality: " />
<combo_box
allow_text_entry="false"
- tool_tip="Controls how detailed shadows are. Settings above 'Medium' are extremely demanding!"
+ tool_tip="(Default: Medium) Controls how detailed shadows are. Settings above 'Medium' are extremely demanding!"
control_name="RenderShadowResolutionScale"
follows="left|top"
height="16"
@@ -67,11 +67,11 @@
<combo_box.item
label="Medium"
name="shadow_med"
- value="1.0" />
+ value="1.000" />
<combo_box.item
label="High"
name="shadow_high"
- value="2" />
+ value="2.0" />
<combo_box.item
label="Very High"
name="shadow_vhigh"
@@ -88,7 +88,7 @@
top_pad="4"
width="130"
layout="topleft"
- tool_tip="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."
+ 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:" />
<slider_bar
top_pad="-18"
@@ -101,7 +101,7 @@
left="140"
right="-68"
name="shadow_bias_slider"
- tool_tip="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."
+ 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"/>
<spinner
top_pad="-20"
@@ -116,7 +116,7 @@
width="55"
increment=".001"
name="shadow_bias_spinner"
- tool_tip="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."
+ 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"/>
<text
follows="left|top"
@@ -125,7 +125,7 @@
top_pad="8"
width="130"
layout="topleft"
- tool_tip="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."
+ 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:" />
<slider_bar
top_pad="-18"
@@ -138,7 +138,7 @@
left="140"
right="-68"
name="shadow_offset_slider"
- tool_tip="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."
+ 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"/>
<spinner
top_pad="-20"
@@ -153,7 +153,7 @@
width="55"
increment=".001"
name="shadow_offset_spinner"
- tool_tip="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."
+ 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"/>
<text
follows="left|top"
@@ -162,7 +162,81 @@
top_pad="8"
width="130"
layout="topleft"
- tool_tip="Controls both Shadow and SSAO blurring. Low values may cause SSAO noise to become apparent."
+ 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:" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment=".001"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="0"
+ min_val="-0.01"
+ left="140"
+ right="-68"
+ 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"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-8"
+ decimal_digits="3"
+ follows="top|right"
+ layout="topleft"
+ max_val="0"
+ min_val="-0.01"
+ width="55"
+ increment=".001"
+ 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"/>
+ <text
+ follows="left|top"
+ height="15"
+ left="30"
+ top_pad="8"
+ width="130"
+ 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:" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment=".001"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="0.15"
+ min_val="0"
+ left="140"
+ right="-68"
+ 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"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-8"
+ decimal_digits="3"
+ follows="top|right"
+ layout="topleft"
+ max_val="0.15"
+ min_val="0.0"
+ width="55"
+ increment=".001"
+ 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"/>
+ <text
+ follows="left|top"
+ height="15"
+ left="30"
+ top_pad="8"
+ width="130"
+ 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:" />
<slider_bar
top_pad="-18"
@@ -175,7 +249,7 @@
left="140"
right="-68"
name="shadow_blur_slider"
- tool_tip="Controls both Shadow and SSAO blurring. Low values may cause SSAO noise to become apparent."
+ tool_tip="(Default: 3.0) Controls both Shadow and SSAO blurring. Low values may cause SSAO noise to become apparent."
control_name="RenderShadowBlurSize"/>
<spinner
top_pad="-20"
@@ -190,7 +264,7 @@
width="55"
increment=".1"
name="shadow_blur_spinner"
- tool_tip="Controls both Shadow and SSAO blurring. Low values may cause SSAO noise to become apparent."
+ tool_tip="(Default: 3.0) Controls both Shadow and SSAO blurring. Low values may cause SSAO noise to become apparent."
control_name="RenderShadowBlurSize"/>
<text
follows="left|top"
@@ -199,7 +273,7 @@
top_pad="8"
width="130"
layout="topleft"
- tool_tip="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!"
+ 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:" />
<slider_bar
top_pad="-18"
@@ -212,7 +286,7 @@
left="140"
right="-68"
name="shadow_blurdist_slider"
- tool_tip="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!"
+ 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"/>
<spinner
top_pad="-20"
@@ -227,7 +301,7 @@
width="55"
increment=".1"
name="shadow_blurdist_spinner"
- tool_tip="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!"
+ 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"/>
<panel
label="SSAO"
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 59997f9a1f84e255a76588586f4e6daa9b33c890..bd89f665ed534046217149e7c1d4466bd06113d0 100644
--- a/indra/newview/skins/default/xui/en/panel_lightbox_ssao.xml
+++ b/indra/newview/skins/default/xui/en/panel_lightbox_ssao.xml
@@ -2,8 +2,8 @@
<panel
class="ssao_settings"
layout="topleft"
- width="300"
- height="175"
+ width="350"
+ height="125"
name="ssao_settings">
<check_box
follows="left|top"
@@ -16,6 +16,7 @@
tool_tip="Toggles SSAO (Also toggles Shadow Smoothing!)"
control_name="RenderDeferredSSAO"/>
<text
+ enabled="false"
follows="left|top"
height="15"
left="30"
@@ -23,8 +24,9 @@
width="130"
layout="topleft"
tool_tip="NYI!"
- value="SSAO Strength:(NYI!)" />
+ value="SSAO Strength:" />
<slider_bar
+ enabled="false"
top_pad="-18"
height="20"
increment=".1"
@@ -38,6 +40,7 @@
tool_tip="NYI!"
control_name=""/>
<spinner
+ enabled="false"
top_pad="-20"
height="15"
label_width="0"
@@ -59,7 +62,44 @@
top_pad="8"
width="130"
layout="topleft"
- tool_tip="Determines distance from surface to check for occlusion. Higher = Wider occlusion NOTE: Large values may produce artifacts."
+ tool_tip="(Default: 5.0) Occlusion sensitivity factor, larger = more."
+ value="SSAO Factor:" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment=".1"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="10"
+ min_val="0"
+ left="140"
+ right="-68"
+ name="ssao_factor_slider"
+ tool_tip="(Default: 5.0) Occlusion sensitivity factor, larger = more."
+ control_name="RenderSSAOFactor"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-8"
+ decimal_digits="1"
+ follows="top|right"
+ layout="topleft"
+ max_val="10"
+ min_val="0"
+ width="55"
+ increment=".1"
+ name="ssao_factor_spinner"
+ tool_tip="(Default: 5.0) Occlusion sensitivity factor, larger = more."
+ control_name="RenderSSAOFactor"/>
+ <text
+ follows="left|top"
+ height="15"
+ left="30"
+ top_pad="8"
+ 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."
value="SSAO Scale:" />
<slider_bar
top_pad="-18"
@@ -71,8 +111,8 @@
min_val="0"
left="140"
right="-68"
- name="ssao_factor_slider"
- tool_tip="Determines distance from surface to check for occlusion. Higher = Wider occlusion NOTE: Large values may produce artifacts."
+ 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"/>
<spinner
top_pad="-20"
@@ -85,9 +125,9 @@
max_val="5000"
min_val="0"
width="55"
- increment=".1"
- name="ssao_factor_spinner"
- tool_tip="Determines distance from surface to check for occlusion. Higher = Wider occlusion NOTE: Large values may produce artifacts."
+ increment="50"
+ 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"/>
<text
follows="left|top"
@@ -96,7 +136,7 @@
top_pad="8"
width="130"
layout="topleft"
- tool_tip="Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
+ tool_tip="(Default: 400) Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
value="SSAO Max Scale:" />
<slider_bar
top_pad="-18"
@@ -109,7 +149,7 @@
left="140"
right="-68"
name="ssao_maxScale_slider"
- tool_tip="Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
+ tool_tip="(Default: 400) Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
control_name="RenderSSAOMaxScale"/>
<spinner
top_pad="-20"
@@ -122,8 +162,8 @@
max_val="1000"
min_val="0"
width="55"
- increment=".1"
+ increment="50"
name="ssao_maxScale_spinner"
- tool_tip="Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
+ tool_tip="(Default: 400) Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
control_name="RenderSSAOMaxScale"/>
</panel>