Merge viewer-release and become version 3.7.16

1 files changed, 54 insertions, 102 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
index 3f67a48b14..525149d7ee 100755
--- a/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/en/panel_postcard_settings.xml
@@ -9,10 +9,10 @@
      height="23"
      label="Resolution"
      layout="topleft"
-     left="10"
+     left="5"
      name="postcard_size_combo"
-     right="-10"
-     top_pad="10">
+     right="-3"
+     top_pad="5">
         <combo_box.item
          label="Current Window"
          name="CurrentWindow"
@@ -34,103 +34,55 @@
          name="Custom"
          value="[i-1,i-1]" />
     </combo_box>
-    <layout_stack
-     animate="false"
-     follows="all"
-     height="275"
-     layout="bottomleft"
-     name="postcard_image_params_ls"
-     left_delta="0"
-     orientation="vertical"
-     top_pad="10"
-     right="-10">
-        <layout_panel
-         follows="top|left|right"
-         height="60"
-         layout="topleft"
-         left="0"
-         name="postcard_image_size_lp"
-         auto_resize="false"
-         top="0"
-         right="-1"
-         visible="true">
-            <spinner
-             allow_text_entry="false"
-             decimal_digits="0"
-             follows="left|top"
-             height="20"
-             increment="32"
-             label="Width"
-             label_width="40"
-             layout="topleft"
-             left="10"
-             max_val="6016"
-             min_val="32"
-             name="postcard_snapshot_width"
-             top_pad="10"
-             width="95" />
-            <spinner
-             allow_text_entry="false"
-             decimal_digits="0"
-             follows="left|top"
-             height="20"
-             increment="32"
-             label="Height"
-             label_width="40"
-             layout="topleft"
-             left_pad="5"
-             max_val="6016"
-             min_val="32"
-             name="postcard_snapshot_height"
-             top_delta="0"
-             width="95" />
-            <check_box
-              height="10"
-             bottom_delta="20"
-             follows="left|top"
-             label="Constrain proportions"
-             layout="topleft"
-             left="10"
-             name="postcard_keep_aspect_check" />
-        </layout_panel>
-        <layout_panel
-         follows="top|left|right"
-         height="23"
-         layout="topleft"
-         left="0"
-         name="postcard_image_format_quality_lp"
-         auto_resize="true"
-         top="0"
-         right="-1"
-         visible="true">
-            <slider
-             decimal_digits="0"
-             follows="left|top"
-             height="15"
-             increment="1"
-             initial_value="75"
-             label="Image quality"
-             label_width="80"
-             layout="topleft"
-             left="0"
-             max_val="100"
-             name="image_quality_slider"
-             top_pad="7"
-             width="190" />
-            <text
-             type="string"
-             follows="left|top"
-             font="SansSerifSmall"
-             length="1"
-             height="14"
-             layout="topleft"
-             left_pad="-5"
-             halign="left"
-             name="image_quality_level"
-             top_delta="0"
-             width="60">
-               ([QLVL])
-            </text>
-        </layout_panel>
-    </layout_stack>
+   <spinner
+    allow_text_entry="false"
+    decimal_digits="0"
+    follows="left|top"
+    height="20"
+    increment="32"
+    label="Width x Height"
+    label_width="90"
+    layout="topleft"
+    left="5"
+    max_val="6016"
+    min_val="32"
+    name="postcard_snapshot_width"
+    top_pad="5"
+    width="144" />
+   <spinner
+    allow_text_entry="false"
+    decimal_digits="0"
+    follows="left|top"
+    height="20"
+    increment="32"
+    label=""
+    label_width="0"
+    layout="topleft"
+    left_pad="0"
+    max_val="6016"
+    min_val="32"
+    name="postcard_snapshot_height"
+    top_delta="0"
+    width="52" />
+   <check_box
+    top_pad="12"
+    follows="left|top"
+    label="Constrain proportions"
+    layout="topleft"
+    left="5"
+    name="postcard_keep_aspect_check" />
+   <slider
+   decimal_digits="0"
+   follows="left|top"
+   height="15"
+   increment="1"
+   initial_value="75"
+   label="Quality:"
+   label_width="45"
+   layout="topleft"
+   left="5"
+   max_val="100"
+   name="image_quality_slider"
+   top_pad="6"
+   width="190" />
 </panel>