From 48cc41a0f8b7b2473e938b1cac8cd294b71d40f7 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Mon, 24 Jun 2013 17:33:10 -0700
Subject: ACME-593: Now the photo tab of the facebook panel displays a
 screenshot based upon when the facebook floater was opened.

---
 .../skins/default/xui/en/floater_social.xml        | 34 ++++++++++++----------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index f99044b233..dc505fb200 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -149,12 +149,12 @@
               1,031 KB
             </text>
             <ui_ctrl
-              height="150"
-              width="250"
-              name="thumbnail_placeholder"
-              top_pad="5"
-              follows="left|top"
-              left="9">
+                height="150"
+                width="250"
+                name="thumbnail_placeholder"
+                top_pad="5"
+                follows="left|top"
+                left="9">
               <panel
                background_visible="true"
                bg_alpha_color="0.9 1 0.9 1"
@@ -168,7 +168,7 @@
                right="-1"
                top="0"
                type="string"
-               visible="true">
+               visible="false">
                 <text
                  follows="all"
                  font="SansSerif"
@@ -198,7 +198,7 @@
                right="-1"
                top="0"
                type="string"
-               visible="true">
+               visible="false">
                 <text
                  follows="all"
                  font="SansSerif"
@@ -221,7 +221,7 @@
                name="working_indicator"
                left="101"
                top="46"
-               visible="true"
+               visible="false"
                width="48" />
               <text
                follows="left|top|right"
@@ -235,7 +235,7 @@
                top="98"
                translate="false"
                type="string"
-               visible="true"
+               visible="false"
                width="130">
                 Working
               </text>
@@ -243,23 +243,25 @@
                follows="left|top"
                height="22"
                image_overlay="Refresh_Off"
-               left="6"
+               left="20"
                name="new_snapshot_btn"
-               bottom="-6"
-               visible="true"
+               bottom="-20"
+               visible="false"
                width="22" />
               <text
                follows="left|top"
                font="SansSerifBold"
+               halign="left"
                height="18"
-               left_pad="6"
+               left_pad="10"
                length="1"
                name="refresh_lbl"
+               right="-5"
                text_color="red"
-               top_delta="5"
+               top_delta="0"
                translate="false"
                type="string"
-               visible="true"
+               visible="false"
                width="130">
                 Refresh to save.
               </text>
-- 
cgit v1.2.3


From 4441edecdf27b9324b61d9e415c257e50e4909a6 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 25 Jun 2013 10:54:59 -0700
Subject: ACME-587 Add the 'refresh' button on top the image

---
 indra/newview/skins/default/xui/en/floater_social.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 5c910ad986..1ae8f7ed65 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -131,10 +131,6 @@
                label="1024x768"
                name="1024x768"
                value="[i1024,i768]" />
-              <combo_box.item
-               label="Custom"
-               name="Custom"
-               value="[i-1,i-1]" />
             </combo_box>
             <text
              follows="left|top"
@@ -147,7 +143,7 @@
              top="12"
              type="string"
              width="50">
-              1,031 KB
+              [SIZE] KB
             </text>
             <ui_ctrl
                 height="150"
-- 
cgit v1.2.3


From 7eae0afabc1b809a756b947c08d05f14f4b9d4e0 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 25 Jun 2013 11:47:45 -0700
Subject: ACME-585 Populate the drop-down box with picture resolutions

---
 indra/newview/skins/default/xui/en/floater_social.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 1ae8f7ed65..f8ab2000cf 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -108,6 +108,7 @@
             help_topic="snapshot_panel"
             name="snapshot_panel">
             <combo_box
+             control_name="SocialPhotoResolution"
              follows="left|top"
              top="6"
              left="9"
-- 
cgit v1.2.3


From 4a8579462c464bd73d79256435d08ebc4112ccf7 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 25 Jun 2013 19:49:13 +0100
Subject: made status update post button disabled for ACME-571

---
 indra/newview/skins/default/xui/en/floater_social.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 1ae8f7ed65..3b19a2f4cb 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -49,7 +49,7 @@
         left="9"
         length="1"
         max_length="700"
-        name="message"
+        name="status_message"
         type="string"
         word_wrap="true">
       </text_editor>
@@ -57,7 +57,7 @@
         follows="left|top"
         height="23"
         label="Post"
-        name="post_btn"
+        name="post_status_btn"
         top_pad="18"
         width="100">
         <button.commit_callback
-- 
cgit v1.2.3