Merge viewer-release 3.7.17

1 files changed, 60 insertions, 56 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
index b5b6dee004..22e6598352 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
@@ -1,29 +1,19 @@
     <panel
       height="400"
-      width="304"
+      width="272"
       layout="topleft"
       follows="all"
       name="panel_facebook_photo">
-      <layout_stack
-	   layout="topleft"
-       border_size="0"
-       height="392"
-       follows="all"
-       orientation="vertical"
-       name="stack_photo"
-       top="8">
-        <layout_panel	
-         name="snapshot_panel"
-         height="367">
             <combo_box
              control_name="FacebookPhotoResolution"
              follows="left|top"
-             top="6"
-             left="9"
+			 layout="topleft"
+             top="7"
+             left="10"
              name="resolution_combobox"
              tool_tip="Image resolution"
              height="21"
-             width="135">
+             width="124">
               <combo_box.item
                label="Current Window"
                name="CurrentWindow"
@@ -47,13 +37,14 @@
             </combo_box>
             <combo_box
                 control_name="FacebookPhotoFilters"
-                follows="right|top"
+                follows="left|top"
+				layout="topleft"
                 name="filters_combobox"
                 tool_tip="Image filters"
-                top="6"
-                left="165"
+                top="7"
+                left_pad="4"
                 height="21"
-                width="135">
+                width="124">
                 <combo_box.item
                 label="No Filter"
                 name="NoFilter"
@@ -61,48 +52,62 @@
             </combo_box>
             <panel
                 height="150"
-                width="250"
+                width="252"
                 visible="true"
+				layout="topleft"
                 name="thumbnail_placeholder"
-                top="33"
-                follows="left|top|right"
-                left="9">
+                top_pad="5"
+                follows="left|top|rith"
+				right="-10"
+                left="10">
             </panel>
-            <button
-             follows="left|top"
-             height="23"
-             label="Refresh"
-             left="9"
-             top_pad="5"
-             name="new_snapshot_btn"
-             tool_tip="Click to refresh"
-             visible="true"
-             width="100" >
-             <button.commit_callback
-               function="SocialSharing.RefreshPhoto" />
-            </button>
-            <text
+			<text
                 follows="left|top"
+				layout="topleft"
                 font="SansSerif"
                 text_color="EmphasisColor"
                 height="14"
-                top_pad="-19"
-                left_pad="-30"
+                top_pad="2"
+                left="10"
                 length="1"
                 halign="center"
                 name="working_lbl"
                 translate="false"
                 type="string"
                 visible="true"
-                width="150">
+                width="251">
                 Refreshing...
             </text>
+			<view_border 
+			 bevel_style="in"
+			 follows="left|top"
+			 layout="topleft"
+			 height="1"
+			 left="10"
+			 name="refresh_border"
+			 width="250"
+			 top_pad="0"/>
+            <button
+             follows="left|top"
+			 layout="topleft"
+             height="23"
+             label="Refresh"
+             left="10"
+             top_pad="5"
+             name="new_snapshot_btn"
+             tool_tip="Click to refresh"
+             visible="true"
+             width="100" >
+             <button.commit_callback
+               function="SocialSharing.RefreshPhoto" />
+            </button>
             <button
                 follows="right|top"
+				layout="topleft"
                 height="23"
                 label="Preview"
-                left="200"
-                top_pad="-19"
+                right="-10"
+                top_delta="0"
                 name="big_preview_btn"
                 tool_tip="Click to toggle preview"
                 is_toggle="true"
@@ -114,9 +119,10 @@
             <text
              length="1"
              follows="top|left|right"
+			 layout="topleft"
              font="SansSerif"
              height="16"
-             left="9"
+             left="10"
              name="caption_label"
              top_pad="20"
              type="string">
@@ -124,23 +130,22 @@
             </text>
             <text_editor
              follows="left|top|right|bottom"
+			 layout="topleft"
              height="87"
              width="250"
-             left="9"
+             left="10"
+			 right="-10"
              length="1"
              max_length="700"
              name="photo_caption"
              type="string"
              word_wrap="true">
             </text_editor>
-        </layout_panel>
-        <layout_panel
-          name="photo_button_panel"
-          height="25">
           <button
-           follows="left|bottom"
-           top="0"
-           left="9"
+           follows="left|top"
+		   layout="topleft"
+           top_pad="22"
+           left="10"
            height="23"
            label="Post"
            name="post_photo_btn"
@@ -149,16 +154,15 @@
              function="SocialSharing.SendPhoto" />
           </button>
           <button
-               follows="left|bottom"
+               follows="right|top"
+			   layout="topleft"
                height="23"
                label="Cancel"
                name="cancel_photo_btn"
-               left_pad="15"
+               right="-10"
                top_delta="0"
                width="100">
             <button.commit_callback
              function="SocialSharing.Cancel" />
-          </button>          
-        </layout_panel>        
-      </layout_stack>
+          </button>
     </panel>