Merge remote-tracking branch 'origin/Project-Lightbox'

indra/newview/skins/default/xui/en/floater_lightbox_settings.xml

@@ -99,13 +99,49 @@
 					increment=".1"
 					name="sharp_strength_spinner"
 					control_name=""/>
+				<!--TODO: This effects multiple values that need to be hooked up-->
+				<text
+					name="sharp_dynamic_text"
+					follows="left|top"
+					height="15"
+					left="100"
+					top_pad="10"
+					width="50"
+					layout="topleft"
+					value="Contrast:" />
+				<slider_bar
+					top_pad="-18"
+					height="20"
+					increment=".1"
+					follows="left|top|right"
+					layout="topleft"
+					max_val="1.0"
+					min_val="0.0"
+					left_delta="80"
+					right="-75"
+					name="sharp_dynamic_slider"
+					control_name=""/>
+				<spinner
+					top_pad="-20"
+					height="15"
+					label_width="0"
+					right="-20"
+					decimal_digits="1"
+					follows="top|right"
+					layout="topleft"
+					max_val="1.0"
+					min_val="0.0"
+					width="55"
+					increment=".1"
+					name="sharp_dynamic_spinner"
+					control_name=""/>
 				<button
 					name="sharpen_default_btn"
 					follows="top|right"
 					layout="topleft"
-					height="22"
+					height="42"
 					left_delta="55"
-					top_pad="-15"
+					top_pad="-36"
 					width="18"
 					scale_image="true"
 					image_overlay="Refresh_Off"
@@ -119,7 +155,7 @@
 					follows="left|top"
 					height="15"
 					left="30"
-					top_pad="4"
+					top_pad="3"
 					width="70"
 					layout="topleft"
 					tool_tip="Which algorithm should translate HDR values to SDR Colorspace"
@@ -205,7 +241,7 @@
 					name="exposure_default_btn"
 					follows="top|right"
 					layout="topleft"
-					height="22"
+					height="20"
 					left_delta="55"
 					top_pad="-15"
 					width="18"
@@ -221,7 +257,7 @@
 					follows="left|top"
 					height="15"
 					left="30"
-					top_pad="4"
+					top_pad="6"
 					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!"