merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3

ignore-dead-branch

1 files changed, 420 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_post_process.xml b/indra/newview/skins/default/xui/en/floater_post_process.xml
new file mode 100644
index 0000000000..5a36ed5fd6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_post_process.xml
@@ -0,0 +1,420 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ height="400"
+ layout="topleft"
+ name="Post-Process Floater"
+ title="Post-Process Settings"
+ width="400">
+    <tab_container
+     follows="left|top"
+     height="400"
+     layout="topleft"
+     left="0"
+     name="Post-Process Tabs"
+     tab_position="top"
+     top="0"
+     width="400">
+        <panel
+         border="true"
+         follows="left|top|right|bottom"
+         height="400"
+         label="Color Filter"
+         layout="topleft"
+         left="1"
+         mouse_opaque="false"
+         name="wmiColorFilterPanel"
+         top="0"
+         width="398">
+            <check_box
+             control_name="wmiColorFilterToggle"
+             height="16"
+             label="Enable"
+             layout="topleft"
+             left="14"
+             name="wmiColorFilterToggle"
+             top="4"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-4"
+             name="wmiColorFilterBrightnessText"
+             top_pad="4"
+             width="355">
+                Brightness
+            </text>
+            <slider
+             control_name="wmiColorFilterBrightness"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             layout="topleft"
+             left_delta="4"
+             max_val="4"
+             name="wmiColorFilterBrightness"
+             top_pad="20"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-4"
+             name="wmiColorFilterSaturationText"
+             top_pad="4"
+             width="355">
+                Saturation
+            </text>
+            <slider
+             control_name="wmiColorFilterSaturation"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             layout="topleft"
+             left_delta="4"
+             max_val="2"
+             min_val="-1"
+             name="wmiColorFilterSaturation"
+             top_pad="20"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-4"
+             name="wmiColorFilterContrastText"
+             top_pad="4"
+             width="355">
+                Contrast
+            </text>
+            <slider
+             control_name="wmiColorFilterContrast"
+             decimal_digits="2"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             layout="topleft"
+             left_delta="4"
+             max_val="4"
+             name="wmiColorFilterContrast"
+             top_pad="20"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-4"
+             name="wmiColorFilterBaseText"
+             top_pad="4"
+             width="355">
+                Contrast Base Color
+            </text>
+            <slider
+             control_name="wmiColorFilterBaseR"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             label="R"
+             layout="topleft"
+             left_delta="4"
+             name="wmiColorFilterBaseR"
+             top_pad="20"
+             width="200" />
+            <slider
+             control_name="wmiColorFilterBaseG"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             label="G"
+             layout="topleft"
+             left_delta="0"
+             name="wmiColorFilterBaseG"
+             top_pad="10"
+             width="200" />
+            <slider
+             control_name="wmiColorFilterBaseB"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="1.0"
+             label="B"
+             layout="topleft"
+             left_delta="0"
+             name="wmiColorFilterBaseB"
+             top_pad="10"
+             width="200" />
+            <slider
+             control_name="wmiColorFilterBaseI"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.5"
+             label="I"
+             layout="topleft"
+             left_delta="0"
+             name="wmiColorFilterBaseI"
+             top_pad="10"
+             width="200" />
+        </panel>
+        <panel
+         border="true"
+         follows="left|top|right|bottom"
+         height="400"
+         label="Night Vision"
+         layout="topleft"
+         left_delta="0"
+         mouse_opaque="false"
+         name="wmiNightVisionPanel"
+         top_delta="-236"
+         width="398">
+            <check_box
+             control_name="wmiNightVisionToggle"
+             height="16"
+             label="Enable"
+             layout="topleft"
+             left="14"
+             name="wmiNightVisionToggle"
+             top="4"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-4"
+             name="wmiNightVisionBrightMultText"
+             top_pad="5"
+             width="355">
+                Light Amplification Multiple
+            </text>
+            <slider
+             control_name="wmiNightVisionBrightMult"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="3.0"
+             layout="topleft"
+             left_delta="4"
+             max_val="10"
+             min_val="1"
+             name="wmiNightVisionBrightMult"
+             top_pad="20"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-4"
+             name="wmiNightVisionNoiseSizeText"
+             top_pad="4"
+             width="355">
+                Noise Size
+            </text>
+            <slider
+             control_name="wmiNightVisionNoiseSize"
+             follows="left"
+             height="10"
+             initial_value="1"
+             layout="topleft"
+             left_delta="4"
+             max_val="100"
+             min_val="1"
+             name="wmiNightVisionNoiseSize"
+             top_pad="20"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-4"
+             name="wmiNightVisionNoiseStrengthText"
+             top_pad="4"
+             width="355">
+                Noise Strength
+            </text>
+            <slider
+             control_name="wmiNightVisionNoiseStrength"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.3"
+             layout="topleft"
+             left_delta="4"
+             name="wmiNightVisionNoiseStrength"
+             top_pad="20"
+             width="200" />
+        </panel>
+        <panel
+         border="true"
+         follows="left|top|right|bottom"
+         height="400"
+         label="Bloom"
+         layout="topleft"
+         left_delta="0"
+         name="wmiBloomPanel"
+         top_delta="-236"
+         width="398">
+            <check_box
+             control_name="wmiBloomToggle"
+             height="16"
+             label="Enable"
+             layout="topleft"
+             left="14"
+             name="wmiBloomToggle"
+             top="4"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-4"
+             name="wmiBloomExtractText"
+             top_pad="5"
+             width="355">
+                Luminosity Extraction
+            </text>
+            <slider
+             control_name="wmiBloomExtract"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="0.9"
+             layout="topleft"
+             left_delta="4"
+             name="wmiBloomExtract"
+             top_pad="20"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-4"
+             name="wmiBloomSizeText"
+             top_pad="4"
+             width="355">
+                Bloom Size
+            </text>
+            <slider
+             control_name="wmiBloomSize"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="3.0"
+             layout="topleft"
+             left_delta="4"
+             max_val="20"
+             name="wmiBloomSize"
+             top_pad="20"
+             width="200" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top|right"
+             font="SansSerif"
+             height="16"
+             layout="topleft"
+             left_delta="-4"
+             name="wmiBloomStrengthText"
+             top_pad="4"
+             width="355">
+                Bloom Strength
+            </text>
+            <slider
+             control_name="wmiBloomStrength"
+             follows="left"
+             height="10"
+             increment="0.01"
+             initial_value="1.2"
+             layout="topleft"
+             left_delta="4"
+             max_val="10"
+             name="wmiBloomStrength"
+             top_pad="20"
+             width="200" />
+        </panel>
+        <panel
+         border="true"
+         follows="left|top|right|bottom"
+         height="400"
+         label="Extras"
+         layout="topleft"
+         left_delta="0"
+         mouse_opaque="false"
+         name="Extras"
+         top_delta="-236"
+         width="398">
+            <button
+             height="20"
+             label="LoadEffect"
+             label_selected="LoadEffect"
+             layout="topleft"
+             left="15"
+             name="PPLoadEffect"
+             top="13"
+             width="100" />
+            <button
+             height="20"
+             label="SaveEffect"
+             label_selected="SaveEffect"
+             layout="topleft"
+             left_delta="0"
+             name="PPSaveEffect"
+             top_pad="7"
+             width="100" />
+            <combo_box
+             height="18"
+             layout="topleft"
+             left_delta="120"
+             name="PPEffectsCombo"
+             top="15"
+             width="150" />
+            <line_editor
+             border_style="line"
+             border_thickness="1"
+             follows="left|right|bottom"
+             font="SansSerif"
+             height="20"
+             label="Effect Name"
+             layout="topleft"
+             left_delta="0"
+             max_length="40"
+             name="PPEffectNameEditor"
+             tab_group="1"
+             top_pad="22"
+             width="150" />
+        </panel>
+    </tab_container>
+</floater>