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/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index f9691acb60322e2db05747b7af4227d98a9e00a0..c359abc4076b056485bead52c1ab7fa658c44dcd 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -421,6 +421,7 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("ao", "floater_ao.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<ALFloaterAO>);
LLFloaterReg::add("delete_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterDeleteQueue>);
LLFloaterReg::add("generic_text", "floater_generic_text.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterGenericText>);
+ LLFloaterReg::add("lightbox_settings", "floater_lightbox_settings.xml", (LLFloaterBuildFunc) &LLFloaterReg::build<LLFloater>);
LLFloaterReg::add("music_ticker", "floater_music_ticker.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloater>);
LLFloaterReg::add("particle_editor", "floater_particle_editor.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<ALFloaterParticleEditor>);
LLFloaterReg::add("quick_settings", "floater_quick_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloater>);
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..1b64c93ac204608017f9780c2ddc2b2187bf1c29
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_lightbox_settings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ width="360"
+ height="310"
+ layout="topleft"
+ min_height="310"
+ min_width="360"
+ name="floater_lightbox_settings"
+ positioning="cascading"
+ title="LIGHTBOX SETTINGS"
+ save_rect="true"
+ can_resize="false"
+ can_resize_height="false">
+ <tab_container
+ top_pad="0"
+ enabled="true"
+ follows="left|top"
+ height="300"
+ left_delta="0"
+ mouse_opaque="false"
+ name="lightbox_tab_container"
+ tab_position="top"
+ tab_stop="false"
+ width="350">
+ <panel
+ label="Image"
+ name="colortone_panel"
+ class="colortone_panel"
+ filename="panel_lightbox_image.xml"
+ layout="topleft"
+ follows="all" />
+ <panel
+ label="DoF"
+ name="dof_panel"
+ class="dof_panel"
+ filename="panel_lightbox_dof.xml"
+ layout="topleft"
+ follows="all" />
+ <panel
+ label="Shadows"
+ name="shadow_panel"
+ class="shadow_panel"
+ filename="panel_lightbox_shadow.xml"
+ layout="topleft"
+ follows="all" />
+ <panel
+ label="Glow"
+ name="glow_panel"
+ class="glow_panel"
+ filename="panel_lightbox_glow.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..a2efb26a60e919242836f7be246b7da25285e58f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_lightbox_dof.xml
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ class="dof_settings"
+ layout="topleft"
+ width="300"
+ height="175"
+ name="dof_settings">
+ <check_box
+ follows="left|top"
+ height="15"
+ left="8"
+ top_pad="4"
+ width="80"
+ layout="topleft"
+ 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="30"
+ top_pad="4"
+ width="70"
+ layout="topleft"
+ 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="-75"
+ 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="-20"
+ 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"/>
+ <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="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):" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment=".1"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="256"
+ min_val="0.5"
+ left="130"
+ 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"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ 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"/>
+ <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="3"
+ width="100"
+ layout="topleft"
+ tool_tip="(Default: 30mm) Focal length of simulated camera."
+ value="Focal Length (mm):" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment="5"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="600"
+ min_val="10"
+ left="130"
+ right="-75"
+ 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="-20"
+ 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"/>
+ <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="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:" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment=".5"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="40"
+ min_val="0"
+ left="130"
+ 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"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ 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"/>
+ <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="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):" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment=".1"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="2"
+ min_val="0"
+ left="130"
+ 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"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ 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"/>
+ <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
new file mode 100644
index 0000000000000000000000000000000000000000..919465c1b01e35a665d90c1b7e5430fa24100d57
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_lightbox_glow.xml
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ class="glow_settings"
+ layout="topleft"
+ width="350"
+ height="150"
+ name="glow_settings">
+ <check_box
+ follows="left|top"
+ height="15"
+ left="8"
+ top_pad="4"
+ width="80"
+ layout="topleft"
+ label="Use Glow Shader"
+ tool_tip="Toggles glow (Reloads Renderer!)"
+ control_name="RenderGlow"/>
+ <text
+ follows="left|top"
+ height="15"
+ left="30"
+ top_pad="4"
+ width="130"
+ layout="topleft"
+ 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."
+ value="Iterations:" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment="1"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="10"
+ min_val="1"
+ left="140"
+ 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"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ decimal_digits="0"
+ follows="top|right"
+ layout="topleft"
+ max_val="10"
+ min_val="1"
+ width="55"
+ increment="1"
+ 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="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."
+ value="Glowmap Resolution:" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment="1"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="10"
+ min_val="0"
+ left="140"
+ 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"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ decimal_digits="0"
+ follows="top|right"
+ layout="topleft"
+ max_val="10"
+ min_val="0"
+ width="55"
+ increment="1"
+ 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="3"
+ width="130"
+ layout="topleft"
+ tool_tip="(Default: .350) Overall strength of the glow shader."
+ value="Strength:" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment="0.005"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="1"
+ min_val="0"
+ left="140"
+ right="-75"
+ name="glow_strength_slider"
+ tool_tip="(Default: .350) Overall strength of the glow shader."
+ control_name="RenderGlowStrength"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ decimal_digits="3"
+ follows="top|right"
+ layout="topleft"
+ max_val="2"
+ min_val="0"
+ width="55"
+ increment="0.005"
+ 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="3"
+ width="130"
+ layout="topleft"
+ tool_tip="(Default: 1.3) Softness or width of glow, eventually gets pixelated at higher sizes."
+ value="Softness:" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment=".05"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="10"
+ min_val="0"
+ left="140"
+ 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"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ decimal_digits="2"
+ follows="top|right"
+ layout="topleft"
+ max_val="10"
+ min_val="0"
+ width="55"
+ increment=".05"
+ 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>
+</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..8bcfc6728c795e3374b0d97b5f1463f6c2f62e9e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_lightbox_image.xml
@@ -0,0 +1,462 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ class="colortone_settings"
+ layout="topleft"
+ width="300"
+ height="175"
+ name="colortone_settings"
+ can_resize="true">
+ <text
+ follows="top"
+ layout="top"
+ height="15"
+ left_delta="10"
+ top_pad="4"
+ 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"
+ name="smaa_combo">
+ <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="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:" />
+ <slider_bar
+ top_pad="-18"
+ height="20"
+ increment=".1"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="2"
+ min_val="0.1"
+ 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"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ decimal_digits="1"
+ follows="top|right"
+ layout="topleft"
+ max_val="3"
+ min_val="0.1"
+ 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."
+ 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="2"
+ width="75"
+ layout="topleft"
+ tool_tip="(Default: Uchimura) Which algorithm should translate HDR values to SDR Colorspace"
+ value="Tonemapper:" />
+ <combo_box
+ allow_text_entry="false"
+ tool_tip="(Default: Uchimura) 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="55"
+ layout="topleft"
+ tool_tip="(Default: 1.0) 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="100"
+ right="-75"
+ name="exposure_slider"
+ tool_tip="(Default: 1.0) Adjusts the overall brightness of the image via the Tonemapper"
+ control_name="RenderToneMapExposure"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ 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="(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="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:" />
+ <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="15"
+ layout="topleft"
+ right="-20"
+ max_chars="200"
+ name="colorlut_combo"
+ top_pad="-15"
+ width="180">
+ <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="Sinner.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. Requires Anti-Aliasing to be enabled!"
+ 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. Requires Anti-Aliasing to be enabled!"
+ 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="50"
+ layout="topleft"
+ tool_tip="NOT YET IMPLEMENTED!"
+ value="Strength:" />
+ <slider_bar
+ enabled="false"
+ top_pad="-18"
+ height="20"
+ increment=".1"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="1"
+ min_val="0"
+ left="100"
+ right="-75"
+ name="sharp_strength_slider"
+ tool_tip="NOT YET IMPLEMENTED!"
+ control_name=""/>
+ <spinner
+ enabled="false"
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ 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=""/>
+ <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
new file mode 100644
index 0000000000000000000000000000000000000000..2f8598de6a86a219730473d76b5c3e50e98d53e3
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_lightbox_shadow.xml
@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ class="shadow_settings"
+ layout="topleft"
+ width="350"
+ height="275"
+ 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="(Default: Medium) Controls how detailed shadows are. Settings above 'Medium' are extremely demanding!"
+ value="Shadow Quality: " />
+ <combo_box
+ allow_text_entry="false"
+ tool_tip="(Default: Medium) 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.000" />
+ <combo_box.item
+ label="High"
+ name="shadow_high"
+ value="2.0" />
+ <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="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:" />
+ <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="-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"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ 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="(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="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:" />
+ <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="-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"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ 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="(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="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:" />
+ <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="-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"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ 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"/>
+ <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="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:" />
+ <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="-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"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ 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"/>
+ <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="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:" />
+ <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="-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"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ 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="(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="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:" />
+ <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="-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"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ 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="(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"
+ 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..138065e61fa1157e5b05de4d42a6f1ace5906e7c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_lightbox_ssao.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ class="ssao_settings"
+ layout="topleft"
+ width="350"
+ height="125"
+ 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
+ enabled="false"
+ follows="left|top"
+ height="15"
+ left="30"
+ top_pad="4"
+ width="130"
+ layout="topleft"
+ tool_tip="NYI!"
+ value="SSAO Strength:" />
+ <slider_bar
+ enabled="false"
+ top_pad="-18"
+ height="20"
+ increment=".1"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="1"
+ min_val="-1"
+ left="140"
+ right="-75"
+ name="ssao_strength_slider"
+ tool_tip="NYI!"
+ control_name=""/>
+ <spinner
+ enabled="false"
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ 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=""/>
+ <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="3"
+ width="130"
+ layout="topleft"
+ 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="-75"
+ 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="-20"
+ 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"/>
+ <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="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."
+ 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="-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"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ decimal_digits="0"
+ follows="top|right"
+ layout="topleft"
+ max_val="5000"
+ min_val="0"
+ width="55"
+ 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"/>
+ <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="3"
+ width="130"
+ layout="topleft"
+ 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"
+ height="20"
+ increment="10"
+ follows="left|top|right"
+ layout="topleft"
+ max_val="1000"
+ min_val="0"
+ left="140"
+ 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"/>
+ <spinner
+ top_pad="-20"
+ height="15"
+ label_width="0"
+ right="-20"
+ decimal_digits="0"
+ follows="top|right"
+ layout="topleft"
+ max_val="1000"
+ min_val="0"
+ width="55"
+ increment="50"
+ 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>
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>