diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 389fc66c2cae76a75ed9d6d4de5f125c37f82420..de35d248361f66fb470ece7ddc3d7d9730cf1b44 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -236,6 +236,16 @@
is_running_function="Floater.IsOpen"
is_running_parameters="quick_settings"
/>
+ <command name="lightbox_settings"
+ available_in_toybox="true"
+ icon="Command_Lightbox_Icon"
+ label_ref="Command_Lightbox_Settings_Label"
+ tooltip_ref="Command_Lightbox_Settings_Tooltip"
+ execute_function="Floater.ToggleOrBringToFront"
+ execute_parameters="lightbox_settings"
+ is_running_function="Floater.IsOpen"
+ is_running_parameters="lightbox_settings"
+ />
<command name="regiontracker"
available_in_toybox="true"
icon="Command_RegionTracker_Icon"
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 4922b815a38498052fddafc0c7d65865b5aa62a1..4eba54719ae377765219245e0d71281104a6e93c 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -149,6 +149,7 @@ with the same filename but different name
<texture name="Command_Grid_Status_Icon" file_name="toolbar_icons/grid_status.png" preload="true" />
<texture name="Command_HowTo_Icon" file_name="toolbar_icons/howto.png" preload="true" />
<texture name="Command_Inventory_Icon" file_name="toolbar_icons/inventory.png" preload="true" />
+ <texture name="Command_Lightbox_Icon" file_name="toolbar_icons/lightbox.png" preload="true" />
<texture name="Command_Map_Icon" file_name="toolbar_icons/map.png" preload="true" />
<texture name="Command_Marketplace_Icon" file_name="toolbar_icons/marketplace.png" preload="true" />
<texture name="Command_MktListings_Icon" file_name="toolbar_icons/mktlistings.png" preload="true" />
diff --git a/indra/newview/skins/default/textures/toolbar_icons/lightbox.png b/indra/newview/skins/default/textures/toolbar_icons/lightbox.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e3155fecd38dcc7d5020ac2432a558999ebfb30
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/lightbox.png differ
diff --git a/indra/newview/skins/default/xui/en/floater_lightbox_settings.xml b/indra/newview/skins/default/xui/en/floater_lightbox_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..915441231e3da627e2709037569522dd72a788f1
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_lightbox_settings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ width="300"
+ height="300"
+ layout="topleft"
+ min_height="300"
+ min_width="300"
+ name="floater_lightbox_settings"
+ positioning="cascading"
+ title="LIGHTBOX SETTINGS"
+ save_rect="true"
+ can_resize="true"
+ can_resize_height="false">
+ <tab_container
+ top_pad="0"
+ enabled="true"
+ follows="left|top"
+ height="300"
+ left="0"
+ mouse_opaque="false"
+ name="lightbox_tab_container"
+ tab_position="top"
+ tab_stop="false"
+ width="300">
+ <panel
+ label="Image Enhancement"
+ name="colortone_panel"
+ class="colortone_panel"
+ filename="panel_lightbox_image.xml"
+ layout="topleft"
+ follows="all" />
+ <panel
+ label="Depth of Field"
+ name="dof_panel"
+ class="dof_panel"
+ filename="panel_lightbox_dof.xml"
+ layout="topleft"
+ follows="all" />
+ <panel
+ label="Shadows + SSAO"
+ name="shadow_panel"
+ class="shadow_panel"
+ filename="panel_lightbox_shadow.xml"
+ layout="topleft"
+ follows="all" />
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_lightbox_dof.xml b/indra/newview/skins/default/xui/en/panel_lightbox_dof.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3f6bb8f81a01d9190ff9426704e48973de335087
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_lightbox_dof.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ class="dof_settings"
+ layout="topleft"
+ 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"
+ left="8"
+ top_pad="4"
+ width="80"
+ layout="topleft"
+ label="Use Depth Of Field"
+ control_name="RenderDepthOfField"
+ />
+ <check_box
+ follows="left|top"
+ height="15"
+ left="24"
+ top_pad="4"
+ width="80"
+ layout="topleft"
+ label="Allow foreground blurring"
+ control_name="RenderDOFallowForeground"
+ />
+ <check_box
+ follows="left|top"
+ height="15"
+ left="24"
+ top_pad="4"
+ width="80"
+ layout="topleft"
+ label="Include Transparent Objects"
+ control_name="RenderDOFallowTransparent"
+ />
+ <text
+ follows="left|top"
+ height="15"
+ left="30"
+ top_pad="4"
+ width="130"
+ layout="topleft"
+ tool_tip="NYI!"
+ 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"/>
+ <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"/>
+ <text
+ follows="left|top"
+ height="15"
+ left="30"
+ top_pad="8"
+ width="130"
+ layout="topleft"
+ tool_tip="NYI!"
+ value="Aperture (fStop):" />
+ <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"/>
+ <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"/>
+ <text
+ follows="left|top"
+ height="15"
+ left="30"
+ top_pad="8"
+ width="130"
+ layout="topleft"
+ tool_tip="NYI!"
+ value="Circle of Confusion:" />
+ <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"/>
+ <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>
diff --git a/indra/newview/skins/default/xui/en/panel_lightbox_image.xml b/indra/newview/skins/default/xui/en/panel_lightbox_image.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f4d712a076c0a182ade41a11854e3bc022d386e6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_lightbox_image.xml
@@ -0,0 +1,380 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ class="colortone_settings"
+ layout="topleft"
+ width="300"
+ height="175"
+ name="colortone_settings">
+ <text
+ follows="left|top"
+ height="15"
+ left="10"
+ top_pad="4"
+ width="110"
+ layout="topleft"
+ tool_tip="Controls SMAA Quality"
+ value="Anti-Aliasing:" />
+ <combo_box
+ 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">
+ <combo_box.item
+ label="Disable"
+ name="smaa_off"
+ value="0" />
+ <combo_box.item
+ label="Low (x2)"
+ name="smaa_2"
+ value="2" />
+ <combo_box.item
+ label="Medium (x4)"
+ name="smaa_4"
+ value="4" />
+ <combo_box.item
+ label="High (x8)"
+ name="smaa_8"
+ value="8" />
+ <combo_box.item
+ label="Ultra (x16)"
+ name="smaa_16"
+ value="16" />
+ </combo_box>
+ <text
+ follows="left|top"
+ height="15"
+ left="10"
+ top_pad="4"
+ width="105"
+ layout="topleft"
+ tool_tip="Controls Anisotropic Filtering Quality"
+ value="Anisotropic Filtering:" />
+ <combo_box
+ allow_text_entry="false"
+ tool_tip="Controls Anisotropic Filtering Quality"
+ control_name="RenderAnisotropicLevel"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="130"
+ max_chars="128"
+ name="anisotropicfilter_combo"
+ top_pad="-16"
+ width="95">
+ <combo_box.item
+ label="Disable"
+ name="anisotropicfilter_off"
+ value="0" />
+ <combo_box.item
+ label="Low (x2)"
+ name="anisotropicfilter_2"
+ value="2" />
+ <combo_box.item
+ label="Medium (x4)"
+ name="anisotropicfilter_4"
+ value="4" />
+ <combo_box.item
+ label="High (x8)"
+ name="anisotropicfilter_8"
+ value="8" />
+ <combo_box.item
+ label="Ultra (x16)"
+ name="anisotropicfilter_16"
+ value="16" />
+ </combo_box>
+ <text
+ follows="left|top"
+ height="15"
+ left="10"
+ top_pad="4"
+ width="75"
+ layout="topleft"
+ tool_tip="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"
+ control_name="RenderToneMapType"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="130"
+ max_chars="128"
+ name="tonemap_type_combo"
+ top_pad="-16"
+ width="95">
+ <combo_box.item
+ label="Linear"
+ name="toneLinear"
+ value="1" />
+ <combo_box.item
+ label="Reinhard"
+ name="toneReinhard"
+ value="2" />
+ <combo_box.item
+ label="Reinhard2"
+ name="toneReinhard2"
+ value="3" />
+ <combo_box.item
+ label="Filmic"
+ name="toneFilmic"
+ value="4" />
+ <combo_box.item
+ label="Unreal"
+ name="toneUnreal"
+ value="5" />
+ <combo_box.item
+ label="ACES"
+ name="toneACES"
+ value="6" />
+ <combo_box.item
+ label="Uchimura"
+ name="toneUchimura"
+ value="7" />
+ <combo_box.item
+ label="Lottes"
+ name="toneLottes"
+ value="8" />
+ <combo_box.item
+ label="Uncharted"
+ name="toneUncharted"
+ value="9" />
+ </combo_box>
+ <text
+ follows="left|top"
+ height="15"
+ left="30"
+ top_pad="4"
+ width="130"
+ layout="topleft"
+ tool_tip="Adjusts the overall brightness of the image via the Tonemapper"
+ value="Exposure:" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment=".1"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="16.0"
+ min_val="0.1"
+ left="90"
+ right="-68"
+ name="exposure_slider"
+ tool_tip="Adjusts the overall brightness of the image via the Tonemapper"
+ control_name="RenderToneMapExposure"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-8"
+ decimal_digits="1"
+ follows="top|right"
+ layout="topleft"
+ max_val="16.0"
+ min_val="0.1"
+ width="55"
+ increment=".1"
+ name="exposure_spinner"
+ tool_tip="Adjusts the overall brightness of the image via the Tonemapper"
+ control_name="RenderToneMapExposure"/>
+ <text
+ follows="left|top"
+ height="15"
+ left="10"
+ top_pad="12"
+ width="75"
+ 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:" />
+ <combo_box
+ allow_text_entry="true"
+ 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"
+ layout="topleft"
+ right="-10"
+ max_chars="200"
+ name="colorlut_combo"
+ top_pad="-18"
+ width="205">
+ <combo_box.item
+ label="Neutral"
+ name="lut_neutral"
+ value="NeutralLUT.png" />
+ <combo_box.item
+ label="CrossProcess - Warm"
+ name="lut_xprocess_warm"
+ value="CrossWarm.png" />
+ <combo_box.item
+ label="CrossProcess - Cool"
+ name="lut_xprocess_cool"
+ value="CrossCool.png" />
+ <combo_box.item
+ label="Acid Trip"
+ name="lut_acidTrip"
+ value="AcidTrip.png" />
+ <combo_box.item
+ label="Battleblue"
+ name="lut_battleblue"
+ value="Battleblue.png" />
+ <combo_box.item
+ label="Crunchy"
+ name="lut_crunchy"
+ value="Crunchy.png" />
+ <combo_box.item
+ label="Dreary"
+ name="lut_dreary"
+ value="Dreary.png" />
+ <combo_box.item
+ label="Fall Painty"
+ name="lut_fallPainty"
+ value="FallPainty.png" />
+ <combo_box.item
+ label="Harshness"
+ name="lut_harshness"
+ value="Harshness.png" />
+ <combo_box.item
+ label="Nuked"
+ name="lut_nuked"
+ value="Nuked.png" />
+ <combo_box.item
+ label="OG Boy"
+ name="lut_ogBoy"
+ value="OGBoy.png" />
+ <combo_box.item
+ label="Old Photo"
+ name="lut_oldPhoto"
+ value="OldPhoto.png" />
+ <combo_box.item
+ label="Pastel Dreams"
+ name="lut_pastelDreams"
+ value="PastelDreams.png" />
+ <combo_box.item
+ label="Purple Haze"
+ name="lut_purpleHaze"
+ value="PurpleHaze.png" />
+ <combo_box.item
+ label="Sickly Blue"
+ name="lut_sicklyBlue"
+ value="SicklyBlue.png" />
+ <combo_box.item
+ label="Sinner 1"
+ name="lut_sinner1"
+ value="Sinner1.png" />
+ <combo_box.item
+ label="Sinner 2"
+ name="lut_sinner2"
+ value="Sinner2.png" />
+ <combo_box.item
+ label="Tealness"
+ name="lut_tealness"
+ value="Tealness.png" />
+ <combo_box.item
+ label="Toonland"
+ name="lut_toonland"
+ value="Toonland.png" />
+ <combo_box.item
+ label="Warm"
+ name="lut_warm"
+ value="Warm.png" />
+ <combo_box.item
+ label="A E S T H E T I C S 1"
+ name="lut_AST1"
+ value="AESTHETICS_1.png" />
+ <combo_box.item
+ label="A E S T H E T I C S 2"
+ name="lut_AST2"
+ value="AESTHETICS_2.png" />
+ <combo_box.item
+ label="A E S T H E T I C S 3"
+ name="lut_AST3"
+ value="AESTHETICS_3.png" />
+ <combo_box.item
+ label="A E S T H E T I C S 4"
+ name="lut_AST4"
+ value="AESTHETICS_4.png" />
+ <combo_box.item
+ label="A E S T H E T I C S 5"
+ name="lut_AST5"
+ value="AESTHETICS_5.png" />
+ </combo_box>
+ <text
+ follows="left|top"
+ height="15"
+ left="10"
+ top_pad="4"
+ width="90"
+ layout="topleft"
+ tool_tip="Which Contrast-Aware Sharpen(CAS) method to use. FidelityFX: AMD's method, nVidia DLS: nVidia's method."
+ value="Sharpen Method:" />
+ <combo_box
+ allow_text_entry="false"
+ tool_tip="Which Contrast-Aware Sharpen(CAS) method to use. FidelityFX: AMD's method, nVidia DLS: nVidia's method."
+ control_name="RenderSharpenMethod"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="130"
+ max_chars="128"
+ name="sharpenmethod_combo"
+ top_pad="-16"
+ width="95">
+ <combo_box.item
+ label="Disable"
+ name="sharp_none"
+ value="0" />
+ <combo_box.item
+ label="FidelityFX"
+ name="sharp_amdfx"
+ value="1" />
+ <combo_box.item
+ label="nVidia DLS"
+ name="sharp_nv"
+ value="2" />
+ </combo_box>
+ <text
+ follows="left|top"
+ height="15"
+ left="30"
+ top_pad="4"
+ width="130"
+ layout="topleft"
+ tool_tip="NOT YET IMPLEMENTED!"
+ value="Strength:" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment=".1"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="1"
+ min_val="0"
+ left="90"
+ right="-68"
+ name="sharp_strength_slider"
+ tool_tip="NOT YET IMPLEMENTED!"
+ control_name=""/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-8"
+ decimal_digits="1"
+ follows="top|right"
+ layout="topleft"
+ max_val="1"
+ min_val="0"
+ width="55"
+ increment=".1"
+ name="sharp_strength_spinner"
+ tool_tip="NOT YET IMPLEMENTED!"
+ control_name=""/>
+</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
new file mode 100644
index 0000000000000000000000000000000000000000..d8ced1ae15d880e2887be66332fcf2d43eccb83d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_lightbox_shadow.xml
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ class="shadow_settings"
+ layout="topleft"
+ width="300"
+ height="175"
+ name="shadow_settings">
+ <text
+ follows="left|top"
+ height="15"
+ left="10"
+ top_pad="4"
+ width="60"
+ layout="topleft"
+ tool_tip="Controls which kind of shadows are allowed. Reloads renderer!"
+ value="Shadows: " />
+ <combo_box
+ allow_text_entry="false"
+ tool_tip="Controls which kind of shadows are allowed. Reloads renderer!"
+ control_name="RenderShadowDetail"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="70"
+ max_chars="128"
+ name="shadowtype_combo"
+ top_pad="-16"
+ width="140">
+ <combo_box.item
+ label="None"
+ name="shadowtype_none"
+ value="0" />
+ <combo_box.item
+ label="Sun/Moon"
+ name="shadowtype_sunmoon"
+ value="1" />
+ <combo_box.item
+ label="Sun/Moon + Projectors"
+ name="shadowtype_proj"
+ value="2" />
+ </combo_box>
+ <text
+ follows="left|top"
+ height="15"
+ left="30"
+ top_pad="4"
+ width="90"
+ layout="topleft"
+ tool_tip="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!"
+ control_name="RenderShadowResolutionScale"
+ follows="left|top"
+ height="16"
+ layout="topleft"
+ left="130"
+ max_chars="128"
+ name="shadowquality_combo"
+ top_pad="-16"
+ width="80">
+ <combo_box.item
+ label="Low"
+ name="shadow_low"
+ value="0.5" />
+ <combo_box.item
+ label="Medium"
+ name="shadow_med"
+ value="1.0" />
+ <combo_box.item
+ label="High"
+ name="shadow_high"
+ value="2" />
+ <combo_box.item
+ label="Very High"
+ name="shadow_vhigh"
+ value="3.0" />
+ <combo_box.item
+ label="Ultra"
+ name="shadow_ultra"
+ value="4.0" />
+ </combo_box>
+ <text
+ follows="left|top"
+ height="15"
+ left="30"
+ 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."
+ value="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_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"/>
+ <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_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"/>
+ <text
+ follows="left|top"
+ height="15"
+ left="30"
+ 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."
+ value="Shadow Offset:" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment=".001"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="0.05"
+ min_val="0"
+ 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."
+ control_name="RenderShadowOffset"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-8"
+ decimal_digits="3"
+ follows="top|right"
+ layout="topleft"
+ max_val="0.05"
+ min_val="0.0"
+ 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."
+ control_name="RenderShadowOffset"/>
+ <text
+ follows="left|top"
+ height="15"
+ left="30"
+ top_pad="8"
+ width="130"
+ layout="topleft"
+ tool_tip="Controls both Shadow and SSAO blurring. Low values may cause SSAO noise to become apparent."
+ value="Shadow Blur:" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment=".1"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="5.0"
+ min_val="0"
+ 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."
+ control_name="RenderShadowBlurSize"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-8"
+ decimal_digits="1"
+ follows="top|right"
+ layout="topleft"
+ max_val="5.0"
+ min_val="0.0"
+ 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."
+ control_name="RenderShadowBlurSize"/>
+ <text
+ follows="left|top"
+ height="15"
+ left="30"
+ 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!"
+ value="Blur Distance:" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment=".1"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="3.0"
+ min_val="0"
+ 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!"
+ control_name="RenderShadowBlurDistFactor"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-8"
+ decimal_digits="1"
+ follows="top|right"
+ layout="topleft"
+ max_val="3.0"
+ min_val="0.0"
+ 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!"
+ control_name="RenderShadowBlurDistFactor"/>
+ <panel
+ label="SSAO"
+ name="ssao_panel"
+ class="ssao_panel"
+ filename="panel_lightbox_ssao.xml"
+ layout="topleft"
+ follows="left|top"
+ left="0"/>
+</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
new file mode 100644
index 0000000000000000000000000000000000000000..59997f9a1f84e255a76588586f4e6daa9b33c890
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_lightbox_ssao.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ class="ssao_settings"
+ layout="topleft"
+ width="300"
+ height="175"
+ name="ssao_settings">
+ <check_box
+ follows="left|top"
+ height="15"
+ left="8"
+ top_pad="4"
+ width="80"
+ layout="topleft"
+ label="Use Screen Space Ambient Occlusion"
+ tool_tip="Toggles SSAO (Also toggles Shadow Smoothing!)"
+ control_name="RenderDeferredSSAO"/>
+ <text
+ follows="left|top"
+ height="15"
+ left="30"
+ top_pad="4"
+ width="130"
+ layout="topleft"
+ tool_tip="NYI!"
+ value="SSAO Strength:(NYI!)" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment=".1"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="1"
+ min_val="-1"
+ left="140"
+ right="-68"
+ name="ssao_strength_slider"
+ tool_tip="NYI!"
+ control_name=""/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-8"
+ decimal_digits="1"
+ follows="top|right"
+ layout="topleft"
+ max_val="1"
+ min_val="-1"
+ width="55"
+ increment=".1"
+ name="ssao_strength_spinner"
+ tool_tip="NYI!"
+ control_name=""/>
+ <text
+ follows="left|top"
+ height="15"
+ left="30"
+ 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."
+ value="SSAO Scale:" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment="10"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="5000"
+ 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."
+ control_name="RenderSSAOScale"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-8"
+ decimal_digits="0"
+ follows="top|right"
+ layout="topleft"
+ 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."
+ control_name="RenderSSAOScale"/>
+ <text
+ follows="left|top"
+ height="15"
+ left="30"
+ top_pad="8"
+ width="130"
+ layout="topleft"
+ tool_tip="Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
+ value="SSAO Max Scale:" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment="10"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="1000"
+ min_val="0"
+ left="140"
+ right="-68"
+ name="ssao_maxScale_slider"
+ tool_tip="Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
+ control_name="RenderSSAOMaxScale"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-8"
+ decimal_digits="0"
+ follows="top|right"
+ layout="topleft"
+ max_val="1000"
+ min_val="0"
+ width="55"
+ increment=".1"
+ name="ssao_maxScale_spinner"
+ tool_tip="Determines max screen radius to use for occlusion. NOTE: Large values may produce artifacts."
+ control_name="RenderSSAOMaxScale"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index a756ef8ca865d05bd97ff40256dfa855b817a22d..847e5676464753c38fdb2e74ca38274b91c32b17 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4166,6 +4166,7 @@ name="Command_360_Capture_Label">360 snapshot</string>
<string name="Command_Grid_Status_Label">Grid status</string>
<string name="Command_HowTo_Label">Guidebook</string>
<string name="Command_Inventory_Label">Inventory</string>
+ <string name="Command_Lightbox_Settings_Label">Lightbox</string>
<string name="Command_Map_Label">Map</string>
<string name="Command_Marketplace_Label">Marketplace</string>
<string name="Command_MarketplaceListings_Label">Marketplace</string>
@@ -4207,6 +4208,7 @@ name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image</string>
<string name="Command_Grid_Status_Tooltip">Show current Grid status</string>
<string name="Command_HowTo_Tooltip">How to do common tasks</string>
<string name="Command_Inventory_Tooltip">View and use your belongings</string>
+ <string name="Command_Lightbox_Settings_Tooltip">Holds various useful photo-centric options.</string>
<string name="Command_Map_Tooltip">Map of the world</string>
<string name="Command_Marketplace_Tooltip">Go shopping</string>
<string name="Command_MarketplaceListings_Tooltip">Sell your creation</string>