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 6559c50139b4a279842373367294623d3cd58381..2ecae47bffa3c0aa031f7337c1e3883112958e90 100644
--- a/indra/newview/skins/default/xui/en/floater_lightbox_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_lightbox_settings.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
width="365"
- height="340"
+ height="380"
layout="topleft"
- min_height="340"
+ min_height="500"
min_width="365"
name="floater_lightbox_settings"
positioning="cascading"
@@ -15,7 +15,7 @@
top_pad="0"
enabled="true"
follows="left|top"
- height="340"
+ height="380"
mouse_opaque="false"
name="lightbox_tab_container"
tab_position="top"
@@ -34,7 +34,7 @@
follows="left|top"
height="15"
left="10"
- top_pad="8"
+ top_pad="12"
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!"
@@ -156,12 +156,20 @@
name="lut_AST5"
value="AESTHETICS_5.png" />
</combo_box>
+ <view_border
+ bevel_style="none"
+ height="0"
+ layout="topleft"
+ left="0"
+ name="cost_text_border"
+ top_pad="6"
+ width="365"/>
<!--Sharpen Controls-->
<text
follows="left|top"
height="15"
left="10"
- top_pad="5"
+ top_pad="7"
width="50"
layout="topleft"
tool_tip="Which Sharpen method to use."
@@ -221,7 +229,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="10"
+ top_pad="12"
width="50"
layout="topleft"
value="Contrast:" />
@@ -254,9 +262,9 @@
name="sharpen_default_btn"
follows="top|right"
layout="topleft"
- height="42"
+ height="44"
left_delta="55"
- top_pad="-36"
+ top_pad="-38"
width="18"
scale_image="true"
image_overlay="Refresh_Off"
@@ -265,12 +273,20 @@
function="LightBox.ResetGroupDefault"
parameter="sharpen" />
</button>
+ <view_border
+ bevel_style="none"
+ height="0"
+ layout="topleft"
+ left="0"
+ name="cost_text_border"
+ top_pad="7"
+ width="365"/>
<!--Tonemapper Control-->
<text
follows="left|top"
height="15"
left="10"
- top_pad="6"
+ top_pad="9"
width="70"
layout="topleft"
tool_tip="Which algorithm should translate HDR values to SDR Colorspace"
@@ -286,7 +302,7 @@
max_chars="128"
name="tonemap_type_combo"
top_pad="-16"
- width="80">
+ width="117">
<combo_box.item
label="ACES"
name="toneACES"
@@ -325,7 +341,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="4"
+ top_pad="5"
width="100"
layout="topleft"
tool_tip="Adjusts the overall brightness of the image via the Tonemapper"
@@ -364,7 +380,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="10"
+ top_pad="12"
width="100"
layout="topleft"
value="TonemapD1:" />
@@ -401,7 +417,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="10"
+ top_pad="12"
width="100"
layout="topleft"
value="TonemapD2:" />
@@ -438,7 +454,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="10"
+ top_pad="12"
width="100"
layout="topleft"
value="TonemapD3:" />
@@ -475,7 +491,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="10"
+ top_pad="12"
width="100"
layout="topleft"
value="TonemapD4:" />
@@ -512,7 +528,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="10"
+ top_pad="12"
width="100"
layout="topleft"
value="TonemapD5:" />
@@ -549,7 +565,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="10"
+ top_pad="12"
width="100"
layout="topleft"
value="TonemapD6:" />
@@ -586,7 +602,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="10"
+ top_pad="12"
width="100"
layout="topleft"
value="TonemapD7:" />
@@ -624,12 +640,132 @@
class="render_settings"
layout="topleft"
name="render_settings">
+ <!--Probe Detail-->
+ <text
+ follows="left|top"
+ height="15"
+ left="10"
+ top_pad="6"
+ width="100"
+ layout="topleft"
+ tool_tip="Controls the maximum probe type allowed to render. Static Only overrides Dynamic probe setting. Realtime updates the nearest Dynamic probe every other frame, extremely demanding."
+ value="Probe Detail:" />
+ <combo_box
+ follows="top|left"
+ layout="topleft"
+ height="16"
+ width="150"
+ right="-2"
+ top_pad="-16"
+ max_chars="128"
+ allow_text_entry="false"
+ tool_tip="Controls the maximum probe type allowed to render. Static Only overrides Dynamic probe setting. Realtime updates the nearest Dynamic probe every other frame, extremely demanding."
+ control_name="RenderReflectionProbeDetail"
+ name="probeDetail_combo">
+ <combo_box.item
+ label="Static Only"
+ name="probeDetail_static"
+ value="0" />
+ <combo_box.item
+ label="Static + Dynamic"
+ name="probeDetail_dynamic"
+ value="1" />
+ <combo_box.item
+ label="Realtime"
+ name="probeDetail_realtime"
+ value="2" />
+ </combo_box>
+ <!--Probe Coverage-->
+ <text
+ follows="left|top"
+ height="15"
+ left="10"
+ top_pad="6"
+ width="100"
+ layout="topleft"
+ tool_tip="Controls reflection probe usage. Autoprobes are generated by the viewer in a 'best effort' placement. Setting this to Manual + Terrain or Manual Only may help overly dark areas that don't have Manual Probes."
+ value="Probe Coverage:" />
+ <combo_box
+ follows="top|left"
+ layout="topleft"
+ height="16"
+ width="150"
+ right="-2"
+ top_pad="-16"
+ max_chars="128"
+ allow_text_entry="false"
+ tool_tip="Controls reflection probe usage. Autoprobes are generated by the viewer in a 'best effort' placement. Setting this to Manual + Terrain or Manual Only may help overly dark areas that don't have Manual Probes."
+ control_name="RenderReflectionProbeLevel"
+ name="probeCoverage_combo">
+ <combo_box.item
+ label="None/Sky Probe"
+ name="probeCoverage_none"
+ value="0" />
+ <combo_box.item
+ label="Manual Only"
+ name="probeCoverage_manual"
+ value="1" />
+ <combo_box.item
+ label="Manual + Terrain"
+ name="probeCoverage_terrain"
+ value="2" />
+ <combo_box.item
+ label="Everything"
+ name="probeCoverage_everything"
+ value="3" />
+ </combo_box>
+ <!--Probe Draw Distance-->
+ <text
+ follows="left|top"
+ height="15"
+ left="10"
+ top_pad="6"
+ width="110"
+ layout="topleft"
+ tool_tip="(Default: 64m) Maximum object distance to be considered for a reflection probe. Higher distances will allow probes to be more accurate to a scene at the cost of generation time and/or performance."
+ value="Probe Draw Distance:" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment="64"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="512"
+ min_val="64"
+ left="120"
+ right="-55"
+ name="probeDist_slider"
+ tool_tip="(Default: 64m) Maximum object distance to be considered for a reflection probe. Higher distances will allow probes to be more accurate to a scene at the cost of generation time and/or performance."
+ control_name="RenderReflectionProbeDrawDistance"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-2"
+ decimal_digits="0"
+ follows="top|right"
+ layout="topleft"
+ max_val="512"
+ min_val="64"
+ width="55"
+ increment="64"
+ name="probeDist_spinner"
+ tool_tip="(Default: 64m) Maximum object distance to be considered for a reflection probe. Higher distances will allow probes to be more accurate to a scene at the cost of generation time and/or performance."
+ control_name="RenderReflectionProbeDrawDistance"/>
+ <view_border
+ bevel_style="none"
+ height="0"
+ layout="topleft"
+ left="0"
+ name="cost_text_border"
+ top_pad="14"
+ width="365"/>
<!--Anti-Aliasing-->
<text
follows="left|top"
height="15"
left="10"
- top_pad="4"
+ top_pad="7"
width="75"
layout="topleft"
tool_tip="Controls Anti-Aliasing Quality"
@@ -682,7 +818,7 @@
follows="left|top"
height="15"
left="10"
- top_pad="4"
+ top_pad="6"
width="120"
layout="topleft"
tool_tip="Controls Anisotropic Filtering Quality"
@@ -720,16 +856,24 @@
name="anisotropicfilter_16"
value="16" />
</combo_box>
+ <view_border
+ bevel_style="none"
+ height="0"
+ layout="topleft"
+ left="0"
+ name="cost_text_border"
+ top_pad="7"
+ width="365"/>
<!--Resolution Scale-->
<!--TODO: Disable if AA is also disabled. This option causes broken rendering otherwise! Bug maybe?-->
<text
follows="left|top"
height="15"
left="10"
- top_pad="4"
+ top_pad="8"
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."
+ tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale."
value="Resolution Scale:" />
<slider_bar
top_pad="-18"
@@ -742,7 +886,7 @@
left="120"
right="-55"
name="resMult_slider"
- tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale. Sharpening interacts poorly with this setting, disable it for best results."
+ tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale."
control_name="RenderResolutionMultiplier"/>
<spinner
top_pad="-20"
@@ -757,14 +901,14 @@
width="55"
increment=".1"
name="resMult_spinner"
- tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale. Sharpening interacts poorly with this setting, disable it for best results."
+ tool_tip="(Default: 1.0) [DANGEROUS] Internal render resolution scale."
control_name="RenderResolutionMultiplier"/>
<!--Draw Distance-->
<text
follows="left|top"
height="15"
left="10"
- top_pad="8"
+ top_pad="12"
width="90"
layout="topleft"
value="Draw Distance:" />
@@ -799,7 +943,7 @@
follows="left|top"
height="15"
left="10"
- top_pad="8"
+ top_pad="12"
width="90"
layout="topleft"
value="Object LOD:" />
@@ -834,7 +978,7 @@
follows="left|top"
height="15"
left="10"
- top_pad="8"
+ top_pad="12"
width="90"
layout="topleft"
value="Max Particles:" />
@@ -869,7 +1013,7 @@
follows="left|top"
height="15"
left="10"
- top_pad="8"
+ top_pad="12"
width="90"
layout="topleft"
value="Max Avatars:" />
@@ -913,7 +1057,7 @@
follows="left|top"
height="15"
left="10"
- top_pad="4"
+ top_pad="6"
width="60"
layout="topleft"
tool_tip="Controls which kind of shadows are allowed. Reloads renderer!"
@@ -949,7 +1093,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="4"
+ top_pad="6"
width="110"
layout="topleft"
tool_tip="Multiplier for shadowmap resolution. Use number input to override safe limits. High multipliers may overload and crash GPU drivers, especially on VRAM-limited systems!"
@@ -963,7 +1107,7 @@
max_val="2"
min_val=".5"
left="140"
- right="-75"
+ right="-80"
name="shadowres_slider"
tool_tip="Multiplier for shadowmap resolution. Use number input to override safe limits. High multipliers may overload and crash GPU drivers, especially on VRAM-limited systems!"
control_name="RenderShadowResolutionScale"/>
@@ -977,7 +1121,7 @@
layout="topleft"
max_val="4"
min_val=".5"
- width="55"
+ width="60"
increment=".1"
name="shadowres_spinner"
tool_tip="Multiplier for shadowmap resolution. Use number input to override safe limits. High multipliers may overload and crash GPU drivers, especially on VRAM-limited systems!"
@@ -987,7 +1131,7 @@
follows="top|right"
layout="topleft"
height="22"
- left_delta="55"
+ left_delta="60"
top_pad="-15"
width="18"
scale_image="true"
@@ -1002,7 +1146,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="3"
+ top_pad="5"
width="110"
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."
@@ -1010,13 +1154,13 @@
<slider_bar
top_pad="-18"
height="20"
- increment=".001"
+ increment=".0001"
follows="left|top|right"
layout="topleft"
max_val="0"
- min_val="-0.01"
+ min_val="-0.005"
left="140"
- right="-75"
+ right="-80"
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."
control_name="RenderShadowBias"/>
@@ -1025,13 +1169,13 @@
height="15"
label_width="0"
right="-20"
- decimal_digits="3"
+ decimal_digits="4"
follows="top|right"
layout="topleft"
max_val="0"
- min_val="-0.01"
- width="55"
- increment=".001"
+ min_val="-0.005"
+ width="60"
+ increment=".0001"
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."
control_name="RenderShadowBias"/>
@@ -1040,7 +1184,7 @@
follows="top|right"
layout="topleft"
height="22"
- left_delta="55"
+ left_delta="60"
top_pad="-15"
width="18"
scale_image="true"
@@ -1055,7 +1199,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="3"
+ top_pad="5"
width="110"
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."
@@ -1066,10 +1210,10 @@
increment=".001"
follows="left|top|right"
layout="topleft"
- max_val="0.05"
+ max_val="0.025"
min_val="0"
left="140"
- right="-75"
+ right="-80"
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."
control_name="RenderShadowOffset"/>
@@ -1081,9 +1225,9 @@
decimal_digits="3"
follows="top|right"
layout="topleft"
- max_val="0.05"
+ max_val="0.025"
min_val="0.0"
- width="55"
+ width="60"
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."
@@ -1093,7 +1237,7 @@
follows="top|right"
layout="topleft"
height="22"
- left_delta="55"
+ left_delta="60"
top_pad="-15"
width="18"
scale_image="true"
@@ -1108,7 +1252,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="3"
+ top_pad="5"
width="110"
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."
@@ -1116,13 +1260,13 @@
<slider_bar
top_pad="-18"
height="20"
- increment=".001"
+ increment=".0001"
follows="left|top|right"
layout="topleft"
max_val="0"
- min_val="-0.01"
+ min_val="-0.005"
left="140"
- right="-75"
+ right="-80"
name="shadow_spotbias_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."
control_name="RenderSpotShadowBias"/>
@@ -1131,13 +1275,13 @@
height="15"
label_width="0"
right="-20"
- decimal_digits="3"
+ decimal_digits="4"
follows="top|right"
layout="topleft"
max_val="0"
- min_val="-0.01"
- width="55"
- increment=".001"
+ min_val="-0.005"
+ width="60"
+ increment=".0001"
name="shadow_spotbias_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."
control_name="RenderSpotShadowBias"/>
@@ -1146,7 +1290,7 @@
follows="top|right"
layout="topleft"
height="22"
- left_delta="55"
+ left_delta="60"
top_pad="-15"
width="18"
scale_image="true"
@@ -1161,7 +1305,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="3"
+ top_pad="5"
width="110"
layout="topleft"
tool_tip="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."
@@ -1173,9 +1317,9 @@
follows="left|top|right"
layout="topleft"
max_val="0.15"
- min_val="0"
+ min_val="0.01"
left="140"
- right="-75"
+ right="-80"
name="shadow_spotoffset_slider"
tool_tip="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"/>
@@ -1188,8 +1332,8 @@
follows="top|right"
layout="topleft"
max_val="0.15"
- min_val="0.0"
- width="55"
+ min_val="0.01"
+ width="60"
increment=".001"
name="shadow_spotoffset_spinner"
tool_tip="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."
@@ -1199,7 +1343,7 @@
follows="top|right"
layout="topleft"
height="22"
- left_delta="55"
+ left_delta="60"
top_pad="-15"
width="18"
scale_image="true"
@@ -1214,7 +1358,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="3"
+ top_pad="5"
width="110"
layout="topleft"
tool_tip="Controls both Shadow and SSAO blurring. Low values may cause SSAO noise to become apparent."
@@ -1228,7 +1372,7 @@
max_val="5.0"
min_val="0"
left="140"
- right="-75"
+ right="-80"
name="shadow_blur_slider"
tool_tip="Controls both Shadow and SSAO blurring. Low values may cause SSAO noise to become apparent."
control_name="RenderShadowBlurSize"/>
@@ -1242,7 +1386,7 @@
layout="topleft"
max_val="5.0"
min_val="0.0"
- width="55"
+ width="60"
increment=".1"
name="shadow_blur_spinner"
tool_tip="Controls both Shadow and SSAO blurring. Low values may cause SSAO noise to become apparent."
@@ -1252,7 +1396,7 @@
follows="top|right"
layout="topleft"
height="22"
- left_delta="55"
+ left_delta="60"
top_pad="-15"
width="18"
scale_image="true"
@@ -1267,7 +1411,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="3"
+ top_pad="5"
width="110"
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!"
@@ -1281,7 +1425,7 @@
max_val="3.0"
min_val="0"
left="140"
- right="-75"
+ right="-80"
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!"
control_name="RenderShadowBlurDistFactor"/>
@@ -1295,7 +1439,7 @@
layout="topleft"
max_val="3.0"
min_val="0.0"
- width="55"
+ width="60"
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!"
@@ -1305,7 +1449,7 @@
follows="top|right"
layout="topleft"
height="22"
- left_delta="55"
+ left_delta="60"
top_pad="-15"
width="18"
scale_image="true"
@@ -1317,13 +1461,13 @@
</button>
<!--SSAO Settings-->
<view_border
- bevel_style="none"
- height="0"
- layout="topleft"
- left="0"
- name="ssao_divider"
- top_pad="7"
- width="350"/>
+ bevel_style="none"
+ height="0"
+ layout="topleft"
+ left="0"
+ name="cost_text_border"
+ top_pad="7"
+ width="492"/>
<!--SSAO Toggle-->
<!--TODO: Disable Sliders if not enabled?-->
<check_box
@@ -1354,7 +1498,7 @@
max_val="1"
min_val="0"
left="140"
- right="-75"
+ right="-80"
show_text="false"
name="ssao_value_slider"
tool_tip="Controls the value of the SSAO HSV transform.."
@@ -1364,12 +1508,12 @@
height="15"
label_width="0"
right="-20"
- decimal_digits="3"
+ decimal_digits="2"
follows="top|right"
layout="topleft"
max_val="1"
min_val="0"
- width="55"
+ width="60"
increment=".01"
name="ssao_value_spinner"
tool_tip="Controls the value of the SSAO HSV transform."
@@ -1379,7 +1523,7 @@
follows="top|right"
layout="topleft"
height="22"
- left_delta="55"
+ left_delta="60"
top_pad="-15"
width="18"
scale_image="true"
@@ -1393,7 +1537,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="4"
+ top_pad="5"
width="110"
layout="topleft"
tool_tip="Controls the saturation of the SSAO HSV transform."
@@ -1407,7 +1551,7 @@
max_val="1"
min_val="0"
left="140"
- right="-75"
+ right="-80"
show_text="false"
name="ssao_sat_slider"
tool_tip="Controls the saturation of the SSAO HSV transform."
@@ -1417,12 +1561,12 @@
height="15"
label_width="0"
right="-20"
- decimal_digits="3"
+ decimal_digits="2"
follows="top|right"
layout="topleft"
max_val="1"
min_val="0"
- width="55"
+ width="60"
increment=".01"
name="ssao_strength_spinner"
tool_tip="Controls the saturation of the SSAO HSV transform."
@@ -1432,7 +1576,7 @@
follows="top|right"
layout="topleft"
height="22"
- left_delta="55"
+ left_delta="60"
top_pad="-15"
width="18"
scale_image="true"
@@ -1447,7 +1591,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="3"
+ top_pad="5"
width="110"
layout="topleft"
tool_tip="Occlusion sensitivity factor, larger = more."
@@ -1461,7 +1605,7 @@
max_val="10"
min_val="0"
left="140"
- right="-75"
+ right="-80"
name="ssao_factor_slider"
tool_tip="Occlusion sensitivity factor, larger = more."
control_name="RenderSSAOFactor"/>
@@ -1470,12 +1614,12 @@
height="15"
label_width="0"
right="-20"
- decimal_digits="3"
+ decimal_digits="1"
follows="top|right"
layout="topleft"
max_val="10"
min_val="0"
- width="55"
+ width="60"
increment=".1"
name="ssao_factor_spinner"
tool_tip="Occlusion sensitivity factor, larger = more."
@@ -1485,7 +1629,7 @@
follows="top|right"
layout="topleft"
height="22"
- left_delta="55"
+ left_delta="60"
top_pad="-15"
width="18"
scale_image="true"
@@ -1500,7 +1644,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="3"
+ top_pad="5"
width="110"
layout="topleft"
tool_tip="Determines distance from surface to check for occlusion. Higher = Wider occlusion NOTE: Large values may produce artifacts."
@@ -1514,7 +1658,7 @@
max_val="5000"
min_val="0"
left="140"
- right="-75"
+ right="-80"
name="ssao_scale_slider"
tool_tip="Determines distance from surface to check for occlusion. Higher = Wider occlusion NOTE: Large values may produce artifacts."
control_name="RenderSSAOScale"/>
@@ -1528,7 +1672,7 @@
layout="topleft"
max_val="5000"
min_val="0"
- width="55"
+ width="60"
increment="50"
name="ssao_scale_spinner"
tool_tip="Determines distance from surface to check for occlusion. Higher = Wider occlusion NOTE: Large values may produce artifacts."
@@ -1538,7 +1682,7 @@
follows="top|right"
layout="topleft"
height="22"
- left_delta="55"
+ left_delta="60"
top_pad="-15"
width="18"
scale_image="true"
@@ -1553,7 +1697,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="3"
+ top_pad="5"
width="110"
layout="topleft"
tool_tip="Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
@@ -1567,7 +1711,7 @@
max_val="1000"
min_val="0"
left="140"
- right="-75"
+ right="-80"
name="ssao_maxScale_slider"
tool_tip="Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
control_name="RenderSSAOMaxScale"/>
@@ -1581,7 +1725,7 @@
layout="topleft"
max_val="1000"
min_val="0"
- width="55"
+ width="60"
increment="50"
name="ssao_maxScale_spinner"
tool_tip="Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
@@ -1591,7 +1735,7 @@
follows="top|right"
layout="topleft"
height="22"
- left_delta="55"
+ left_delta="60"
top_pad="-15"
width="18"
scale_image="true"
@@ -1613,7 +1757,7 @@
follows="left|top"
height="15"
left="8"
- top_pad="4"
+ top_pad="7"
width="80"
layout="topleft"
label="Use Glow Shader"
@@ -1677,7 +1821,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="3"
+ top_pad="5"
width="60"
layout="topleft"
tool_tip="Overall resolution of glow. Higher values allow for wider glow. Use in conjunction with other glow settings for best effect."
@@ -1730,7 +1874,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="3"
+ top_pad="5"
width="60"
layout="topleft"
tool_tip="Overall strength of the glow shader."
@@ -1783,7 +1927,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="3"
+ top_pad="5"
width="60"
layout="topleft"
tool_tip="Softness or width of glow, eventually gets pixelated at higher sizes."
@@ -1911,7 +2055,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="4"
+ top_pad="8"
width="70"
layout="topleft"
tool_tip="Vertical FoV for DoF calculations"
@@ -1964,7 +2108,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="3"
+ top_pad="5"
width="65"
layout="topleft"
tool_tip="Simulated camera aperture f-value. Smaller f-stops result in a narrower focal range. Larger increases focal range."
@@ -2017,7 +2161,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="3"
+ top_pad="5"
width="100"
layout="topleft"
tool_tip="Focal length of simulated camera."
@@ -2071,7 +2215,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="3"
+ top_pad="5"
width="80"
layout="topleft"
tool_tip="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"
@@ -2124,7 +2268,7 @@
follows="left|top"
height="15"
left="30"
- top_pad="3"
+ top_pad="5"
width="100"
layout="topleft"
tool_tip="Time it takes for the camera to transition to a new focal point."
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index bdc04a8a78864d4e32de2a6c5ab6ec9242bdceaf..59e3fc1000ae18d3449f5b089549e73174c5faf9 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -4,7 +4,7 @@
can_dock="false"
can_minimize="false"
can_resize="false"
- height="430"
+ height="455"
help_topic="toybox"
layout="topleft"
legacy_header_height="18"
@@ -13,7 +13,7 @@
save_rect="true"
single_instance="true"
title="TOOLBAR BUTTONS"
- width="650">
+ width="675">
<text
follows="left|top"
font="SansSerifMedium"
@@ -81,11 +81,11 @@
<panel
bevel_style="none"
border="true"
- bottom="366"
+ bottom="390"
follows="left|bottom|right"
left="20"
right="-20"
- top="366" />
+ top="390" />
<button
follows="left|bottom|right"
height="23"
@@ -94,7 +94,7 @@
layout="topleft"
left="185"
name="btn_clear_all"
- top="385"
+ top="-45"
width="130">
<button.commit_callback function="Toybox.ClearAll" />
</button>
@@ -106,7 +106,7 @@
layout="topleft"
left="335"
name="btn_restore_defaults"
- top="385"
+ top="-45"
width="130">
<button.commit_callback function="Toybox.RestoreDefaults" />
</button>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 1c722525fa561ac5a8ef2326f579501a3533319a..f772be346f4e2115b768a9420ed0766d8667f8b2 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -156,7 +156,7 @@
control_name="AlchemyLookAtClampEnabled"
disabled_control="AlchemyLookAtPrivate"
height="16"
- label="Limit Look At distance from avatar head"
+ label="Limit Look At Distance"
layout="topleft"
left="30"
name="privatelookat"