From 1b8b6e76bf175c4d0ead8d3fc6f01558066cbec9 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Fri, 1 Nov 2013 20:47:28 +0100
Subject: added LLFlickrConnect for ACME-1116

---
 indra/newview/skins/default/xui/en/notifications.xml | 9 ++++++++-
 indra/newview/skins/default/xui/en/strings.xml       | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e7c89db069..b562c5cb5e 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6044,7 +6044,14 @@ Please select at least one type of content to search (General, Moderate, or Adul
   type="notifytip">
 [MESSAGE]
  </notification>
-    
+
+  <notification
+   icon="notify.tga"
+   name="FlickrConnect"
+   type="notifytip">
+    [MESSAGE]
+  </notification>
+
   <notification
    icon="notify.tga"
    name="PaymentReceived"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 8ac95beddb..0d2083632d 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3442,6 +3442,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="facebook_post_success">
     You posted to Facebook.
   </string>
+  <string name="flickr_post_success">
+    You posted to Flickr.
+  </string>
 
   <string name="no_session_message">
     (IM Session Doesn't Exist)
-- 
cgit v1.2.3


From 963c97f64a4d1490fe8380805c4de38598adddad Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Fri, 1 Nov 2013 23:12:45 +0100
Subject: added LLTwitterConnect for ACME-1133

---
 indra/newview/skins/default/xui/en/notifications.xml | 7 +++++++
 indra/newview/skins/default/xui/en/strings.xml       | 3 +++
 2 files changed, 10 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b562c5cb5e..a3c0682aea 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6052,6 +6052,13 @@ Please select at least one type of content to search (General, Moderate, or Adul
     [MESSAGE]
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="TwitterConnect"
+   type="notifytip">
+    [MESSAGE]
+  </notification>
+
   <notification
    icon="notify.tga"
    name="PaymentReceived"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 0d2083632d..df04ddee86 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3445,6 +3445,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="flickr_post_success">
     You posted to Flickr.
   </string>
+  <string name="twitter_post_success">
+    You posted to Twitter.
+  </string>
 
   <string name="no_session_message">
     (IM Session Doesn't Exist)
-- 
cgit v1.2.3


From 0e71fb3c9d82bf2a307431f68f8ec84d223a4887 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Sat, 2 Nov 2013 01:50:17 +0100
Subject: added Flickr floater for ACME-1136, ACME-1137, ACME-1138, ACME-1140,
 and ACME-1141

---
 .../skins/default/xui/en/floater_flickr.xml        |  89 ++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |  23 ++--
 .../skins/default/xui/en/panel_flickr_account.xml  |  75 ++++++++++
 .../skins/default/xui/en/panel_flickr_photo.xml    | 152 +++++++++++++++++++++
 indra/newview/skins/default/xui/en/strings.xml     |  20 ++-
 5 files changed, 344 insertions(+), 15 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_flickr.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_flickr_account.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_flickr_photo.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_flickr.xml b/indra/newview/skins/default/xui/en/floater_flickr.xml
new file mode 100644
index 0000000000..441e3ee73d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_flickr.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<floater
+  positioning="cascading"
+  can_close="true"
+  can_resize="false"
+  help_topic="floater_flickr"
+  layout="topleft"
+  name="floater_flickr"
+  save_rect="true"
+  single_instance="true"
+  reuse_instance="true"
+  title="UPLOAD TO FLICKR"
+  height="482"
+  width="304">
+  <panel
+   height="482"
+   width="304"
+   visible="true"
+   name="background"
+   follows="all"
+   top="0"
+   left="0">
+   <tab_container
+     name="tabs"
+     tab_group="1"
+     tab_min_width="70"
+     tab_height="30"
+     tab_position="top"
+     top="7"
+     height="437"
+     halign="center">
+     <panel
+       filename="panel_flickr_photo.xml"
+       class="llflickrphotopanel"
+       follows="all"
+       label="PHOTO"
+       name="panel_flickr_photo"/>
+     <panel
+       filename="panel_flickr_account.xml"
+       class="llflickraccountpanel"
+       follows="all"
+       label="ACCOUNT"
+       name="panel_flickr_account"/>     
+    </tab_container>
+    <panel
+     name="connection_status_panel"
+     follows="left|bottom|right"
+     height="24">
+     <text
+      name="connection_error_text"
+      type="string"
+      follows="left|bottom|right"
+      top="5"
+      left="9"
+      width="250"
+      height="20"
+      wrap="true"
+      halign="left"
+      valign="center"
+      text_color="DrYellow"
+      font="SansSerif">
+      Error
+     </text>
+     <loading_indicator
+      follows="left|bottom|right"
+      height="24"
+      width="24"
+      name="connection_loading_indicator"
+      top="2"
+      left="9"
+      visible="true"/>
+     <text
+      name="connection_loading_text"
+      type="string"
+      follows="left|bottom|right"
+      top="5"
+      left_pad="5"
+      width="250"
+      height="20"
+      wrap="true"
+      halign="left"
+      valign="center"
+      text_color="EmphasisColor"
+      font="SansSerif">
+      Loading...
+    </text>
+  </panel>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index d635b8ee93..19fe706885 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -15,14 +15,6 @@
          function="ShowAgentProfile"
          parameter="agent" />
       </menu_item_call>
-      <menu_item_call
-        label="Post to Facebook..."
-        name="PostToFacebook">
-        <menu_item_call.on_click
-          function="Floater.Toggle"
-          parameter="social"/>
-      </menu_item_call>      
-      <menu_item_separator/>
       <menu_item_call
        label="Appearance..."
        name="ChangeOutfit">
@@ -288,6 +280,21 @@
              parameter="conversation" />
         </menu_item_check>
         <menu_item_separator/>
+      <menu_item_call
+        label="Post to Facebook..."
+        name="PostToFacebook">
+        <menu_item_call.on_click
+          function="Floater.Toggle"
+          parameter="social"/>
+      </menu_item_call>
+      <menu_item_call
+        label="Upload to Flickr..."
+        name="UploadToFacebook">
+        <menu_item_call.on_click
+          function="Floater.Toggle"
+          parameter="flickr"/>
+      </menu_item_call>
+        <menu_item_separator/>
         <menu
          label="Voice morphing"
          name="VoiceMorphing"
diff --git a/indra/newview/skins/default/xui/en/panel_flickr_account.xml b/indra/newview/skins/default/xui/en/panel_flickr_account.xml
new file mode 100644
index 0000000000..c76a42904b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_flickr_account.xml
@@ -0,0 +1,75 @@
+<panel
+	 height="400"
+	 width="304"
+	 layout="topleft"
+   name="panel_flickr_account">
+  <string
+      name="flickr_connected"
+      value="You are connected to Flickr as:" />
+  <string
+      name="flickr_disconnected"
+      value="Not connected to Flickr" />
+  <text
+   layout="topleft"
+   length="1"
+   follows="top|left"
+   font="SansSerif"
+   height="16"
+   left="9"
+   name="account_caption_label"
+   top="21"
+   type="string">
+    Not connected to Flickr.
+  </text>
+  <text
+   layout="topleft"
+   top_pad="2"
+   length="1"
+   follows="top|left"
+   font="SansSerif"
+   height="16"
+   left="9"
+   name="account_name_label"
+   parse_urls="true"
+   type="string"/>
+  <panel
+    layout="topleft"
+    name="panel_buttons"
+    height="345"
+    left="9">
+    <button
+     layout="topleft"
+     follows="left|top"
+     top_pad="9"
+     visible="true"
+     height="23"
+     label="Connect..."
+     name="connect_btn"
+     width="210">
+      <commit_callback function="SocialSharing.Connect"/>
+    </button>
+
+    <button
+     layout="topleft"
+     follows="left|top"
+     top_delta="0"
+     height="23"
+     label="Disconnect"
+     name="disconnect_btn"
+     width="210"
+     visible="false">
+      <commit_callback function="SocialSharing.Disconnect"/>
+    </button>
+    <text
+      layout="topleft"
+      length="1"
+      follows="top|left"
+      height="16"
+      left="0"
+      name="account_learn_more_label"
+      top_pad="20"
+      type="string">
+      [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share/ta-p/2149711 Learn about posting to Flickr]
+    </text>
+  </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
new file mode 100644
index 0000000000..1fc4927ac2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -0,0 +1,152 @@
+    <panel
+      height="400"
+      width="304"
+      layout="topleft"
+      name="panel_flickr_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="SocialPhotoResolution"
+             follows="left|top"
+             top="6"
+             left="9"
+             name="resolution_combobox"
+             tool_tip="Image resolution"
+             height="21"
+             width="135">
+              <combo_box.item
+               label="Current Window"
+               name="CurrentWindow"
+               value="[i0,i0]" />
+              <combo_box.item
+               label="640x480"
+               name="640x480"
+               value="[i640,i480]" />
+              <combo_box.item
+               label="800x600"
+               name="800x600"
+               value="[i800,i600]" />
+              <combo_box.item
+               label="1024x768"
+               name="1024x768"
+               value="[i1024,i768]" />
+            </combo_box>
+            <text
+             follows="left|top"
+             font="SansSerifSmall"
+             height="14"
+             left="208"
+             length="1"
+             halign="right"
+             name="file_size_label"
+             top="9"
+             type="string"
+             width="50">
+              [SIZE] KB
+            </text>
+            <panel
+                height="150"
+                width="250"
+                visible="true"
+                name="thumbnail_placeholder"
+                top="33"
+                follows="left|top"
+                left="9">
+            </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
+                follows="left|top"
+                font="SansSerif"
+                text_color="EmphasisColor"
+                height="14"
+                top_pad="-19"
+                left_pad="-20"
+                length="1"
+                halign="center"
+                name="working_lbl"
+                translate="false"
+                type="string"
+                visible="true"
+                width="150">
+                Refreshing...
+            </text>
+            <text
+             length="1"
+             follows="top|left|right"
+             font="SansSerif"
+             height="16"
+             left="9"
+             name="caption_label"
+             top_pad="20"
+             type="string">
+              Comment (optional):
+            </text>
+            <text_editor
+             follows="left|top"
+             height="87"
+             width="250"
+             left="9"
+             length="1"
+             max_length="700"
+             name="photo_caption"
+             type="string"
+             word_wrap="true">
+            </text_editor>
+            <check_box
+             follows="left|top"
+             initial_value="true"
+             label="Include location in posting"
+             name="add_location_cb"
+              left="9"
+              height="16"
+             top_pad="8"/>
+        </layout_panel>
+        <layout_panel
+          name="photo_button_panel"
+          height="25">
+          <button
+           follows="left|top"
+           top="0"
+           left="9"
+           height="23"
+           label="Post"
+           name="post_photo_btn"
+           width="100">
+            <button.commit_callback
+             function="SocialSharing.SendPhoto" />
+          </button>
+          <button
+               follows="left|top"
+               height="23"
+               label="Cancel"
+               name="cancel_photo_btn"
+               left_pad="15"
+               top_delta="0"
+               width="100">
+            <button.commit_callback
+             function="SocialSharing.Cancel" />
+          </button>          
+        </layout_panel>        
+      </layout_stack>
+    </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index df04ddee86..ce09faeac0 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -148,13 +148,19 @@ Please try logging in again in a minute.</string>
 	<string name="SentToInvalidRegion">You were sent to an invalid region.</string>
 	<string name="TestingDisconnect">Testing viewer disconnect</string>
 
-	<!-- Facebook Connect and, eventually, other Social Network -->
-	<string name="SocialFacebookConnecting">Connecting to Facebook...</string>
-	<string name="SocialFacebookPosting">Posting...</string>
-	<string name="SocialFacebookDisconnecting">Disconnecting from Facebook...</string>
-	<string name="SocialFacebookErrorConnecting">Problem connecting to Facebook</string>
-	<string name="SocialFacebookErrorPosting">Problem posting to Facebook</string>
-	<string name="SocialFacebookErrorDisconnecting">Problem disconnecting from Facebook</string>
+	<!-- SLShare: Facebook, Flickr, and so on... -->
+  <string name="SocialFacebookConnecting">Connecting to Facebook...</string>
+  <string name="SocialFacebookPosting">Posting...</string>
+  <string name="SocialFacebookDisconnecting">Disconnecting from Facebook...</string>
+  <string name="SocialFacebookErrorConnecting">Problem connecting to Facebook</string>
+  <string name="SocialFacebookErrorPosting">Problem posting to Facebook</string>
+  <string name="SocialFacebookErrorDisconnecting">Problem disconnecting from Facebook</string>
+  <string name="SocialFlickrConnecting">Connecting to Flickr...</string>
+  <string name="SocialFlickrPosting">Posting...</string>
+  <string name="SocialFlickrDisconnecting">Disconnecting from Flickr...</string>
+  <string name="SocialFlickrErrorConnecting">Problem connecting to Flickr</string>
+  <string name="SocialFlickrErrorPosting">Problem posting to Flickr</string>
+  <string name="SocialFlickrErrorDisconnecting">Problem disconnecting from Flickr</string>
     
 	<!-- Tooltip -->
 	<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
-- 
cgit v1.2.3


From 7c46eb17f24e30fe83469a297086aa93f100e5ed Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Mon, 4 Nov 2013 19:12:39 +0000
Subject: Changed SLShare menu text to match spec for ACME-1138

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 19fe706885..bbd6e94579 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -281,14 +281,14 @@
         </menu_item_check>
         <menu_item_separator/>
       <menu_item_call
-        label="Post to Facebook..."
+        label="Facebook..."
         name="PostToFacebook">
         <menu_item_call.on_click
           function="Floater.Toggle"
           parameter="social"/>
       </menu_item_call>
       <menu_item_call
-        label="Upload to Flickr..."
+        label="Flickr..."
         name="UploadToFacebook">
         <menu_item_call.on_click
           function="Floater.Toggle"
-- 
cgit v1.2.3


From cea9ffe89ce98f04e311aa989cce5955e77a15ff Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Mon, 4 Nov 2013 23:42:21 +0000
Subject: added Twitter floater for ACME-1146, ACME-1147, ACME-1148, ACME-1149,
 and ACME-1150

---
 .../skins/default/xui/en/floater_twitter.xml       |  89 ++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |  11 +-
 .../skins/default/xui/en/panel_twitter_account.xml |  75 ++++++++++
 .../skins/default/xui/en/panel_twitter_photo.xml   | 152 +++++++++++++++++++++
 indra/newview/skins/default/xui/en/strings.xml     |   8 +-
 5 files changed, 332 insertions(+), 3 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_twitter.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_twitter_account.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_twitter_photo.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_twitter.xml b/indra/newview/skins/default/xui/en/floater_twitter.xml
new file mode 100644
index 0000000000..7007a14cdb
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_twitter.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<floater
+  positioning="cascading"
+  can_close="true"
+  can_resize="false"
+  help_topic="floater_twitter"
+  layout="topleft"
+  name="floater_twitter"
+  save_rect="true"
+  single_instance="true"
+  reuse_instance="true"
+  title="TWITTER"
+  height="482"
+  width="304">
+  <panel
+   height="482"
+   width="304"
+   visible="true"
+   name="background"
+   follows="all"
+   top="0"
+   left="0">
+   <tab_container
+     name="tabs"
+     tab_group="1"
+     tab_min_width="70"
+     tab_height="30"
+     tab_position="top"
+     top="7"
+     height="437"
+     halign="center">
+     <panel
+       filename="panel_twitter_photo.xml"
+       class="lltwitterphotopanel"
+       follows="all"
+       label="COMPOSE"
+       name="panel_twitter_photo"/>
+     <panel
+       filename="panel_twitter_account.xml"
+       class="lltwitteraccountpanel"
+       follows="all"
+       label="ACCOUNT"
+       name="panel_twitter_account"/>     
+    </tab_container>
+    <panel
+     name="connection_status_panel"
+     follows="left|bottom|right"
+     height="24">
+     <text
+      name="connection_error_text"
+      type="string"
+      follows="left|bottom|right"
+      top="5"
+      left="9"
+      width="250"
+      height="20"
+      wrap="true"
+      halign="left"
+      valign="center"
+      text_color="DrYellow"
+      font="SansSerif">
+      Error
+     </text>
+     <loading_indicator
+      follows="left|bottom|right"
+      height="24"
+      width="24"
+      name="connection_loading_indicator"
+      top="2"
+      left="9"
+      visible="true"/>
+     <text
+      name="connection_loading_text"
+      type="string"
+      follows="left|bottom|right"
+      top="5"
+      left_pad="5"
+      width="250"
+      height="20"
+      wrap="true"
+      halign="left"
+      valign="center"
+      text_color="EmphasisColor"
+      font="SansSerif">
+      Loading...
+    </text>
+  </panel>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index bbd6e94579..79adb4e8bb 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -282,14 +282,21 @@
         <menu_item_separator/>
       <menu_item_call
         label="Facebook..."
-        name="PostToFacebook">
+        name="Facebook">
         <menu_item_call.on_click
           function="Floater.Toggle"
           parameter="social"/>
       </menu_item_call>
+      <menu_item_call
+        label="Twitter..."
+        name="Twitter">
+        <menu_item_call.on_click
+          function="Floater.Toggle"
+          parameter="twitter"/>
+      </menu_item_call>
       <menu_item_call
         label="Flickr..."
-        name="UploadToFacebook">
+        name="Flickr">
         <menu_item_call.on_click
           function="Floater.Toggle"
           parameter="flickr"/>
diff --git a/indra/newview/skins/default/xui/en/panel_twitter_account.xml b/indra/newview/skins/default/xui/en/panel_twitter_account.xml
new file mode 100644
index 0000000000..4a413bd711
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_twitter_account.xml
@@ -0,0 +1,75 @@
+<panel
+	 height="400"
+	 width="304"
+	 layout="topleft"
+   name="panel_twitter_account">
+  <string
+      name="twitter_connected"
+      value="You are connected to Twitter as:" />
+  <string
+      name="twitter_disconnected"
+      value="Not connected to Twitter" />
+  <text
+   layout="topleft"
+   length="1"
+   follows="top|left"
+   font="SansSerif"
+   height="16"
+   left="9"
+   name="account_caption_label"
+   top="21"
+   type="string">
+    Not connected to Twitter.
+  </text>
+  <text
+   layout="topleft"
+   top_pad="2"
+   length="1"
+   follows="top|left"
+   font="SansSerif"
+   height="16"
+   left="9"
+   name="account_name_label"
+   parse_urls="true"
+   type="string"/>
+  <panel
+    layout="topleft"
+    name="panel_buttons"
+    height="345"
+    left="9">
+    <button
+     layout="topleft"
+     follows="left|top"
+     top_pad="9"
+     visible="true"
+     height="23"
+     label="Connect..."
+     name="connect_btn"
+     width="210">
+      <commit_callback function="SocialSharing.Connect"/>
+    </button>
+
+    <button
+     layout="topleft"
+     follows="left|top"
+     top_delta="0"
+     height="23"
+     label="Disconnect"
+     name="disconnect_btn"
+     width="210"
+     visible="false">
+      <commit_callback function="SocialSharing.Disconnect"/>
+    </button>
+    <text
+      layout="topleft"
+      length="1"
+      follows="top|left"
+      height="16"
+      left="0"
+      name="account_learn_more_label"
+      top_pad="20"
+      type="string">
+      [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share/ta-p/2149711 Learn about posting to Twitter]
+    </text>
+  </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
new file mode 100644
index 0000000000..058c65402a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
@@ -0,0 +1,152 @@
+    <panel
+      height="400"
+      width="304"
+      layout="topleft"
+      name="panel_twitter_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="SocialPhotoResolution"
+             follows="left|top"
+             top="6"
+             left="9"
+             name="resolution_combobox"
+             tool_tip="Image resolution"
+             height="21"
+             width="135">
+              <combo_box.item
+               label="Current Window"
+               name="CurrentWindow"
+               value="[i0,i0]" />
+              <combo_box.item
+               label="640x480"
+               name="640x480"
+               value="[i640,i480]" />
+              <combo_box.item
+               label="800x600"
+               name="800x600"
+               value="[i800,i600]" />
+              <combo_box.item
+               label="1024x768"
+               name="1024x768"
+               value="[i1024,i768]" />
+            </combo_box>
+            <text
+             follows="left|top"
+             font="SansSerifSmall"
+             height="14"
+             left="208"
+             length="1"
+             halign="right"
+             name="file_size_label"
+             top="9"
+             type="string"
+             width="50">
+              [SIZE] KB
+            </text>
+            <panel
+                height="150"
+                width="250"
+                visible="true"
+                name="thumbnail_placeholder"
+                top="33"
+                follows="left|top"
+                left="9">
+            </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
+                follows="left|top"
+                font="SansSerif"
+                text_color="EmphasisColor"
+                height="14"
+                top_pad="-19"
+                left_pad="-20"
+                length="1"
+                halign="center"
+                name="working_lbl"
+                translate="false"
+                type="string"
+                visible="true"
+                width="150">
+                Refreshing...
+            </text>
+            <text
+             length="1"
+             follows="top|left|right"
+             font="SansSerif"
+             height="16"
+             left="9"
+             name="caption_label"
+             top_pad="20"
+             type="string">
+              Comment (optional):
+            </text>
+            <text_editor
+             follows="left|top"
+             height="87"
+             width="250"
+             left="9"
+             length="1"
+             max_length="700"
+             name="photo_caption"
+             type="string"
+             word_wrap="true">
+            </text_editor>
+            <check_box
+             follows="left|top"
+             initial_value="true"
+             label="Include location in posting"
+             name="add_location_cb"
+              left="9"
+              height="16"
+             top_pad="8"/>
+        </layout_panel>
+        <layout_panel
+          name="photo_button_panel"
+          height="25">
+          <button
+           follows="left|top"
+           top="0"
+           left="9"
+           height="23"
+           label="Post"
+           name="post_photo_btn"
+           width="100">
+            <button.commit_callback
+             function="SocialSharing.SendPhoto" />
+          </button>
+          <button
+               follows="left|top"
+               height="23"
+               label="Cancel"
+               name="cancel_photo_btn"
+               left_pad="15"
+               top_delta="0"
+               width="100">
+            <button.commit_callback
+             function="SocialSharing.Cancel" />
+          </button>          
+        </layout_panel>        
+      </layout_stack>
+    </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ce09faeac0..2b707ed84b 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -148,7 +148,7 @@ Please try logging in again in a minute.</string>
 	<string name="SentToInvalidRegion">You were sent to an invalid region.</string>
 	<string name="TestingDisconnect">Testing viewer disconnect</string>
 
-	<!-- SLShare: Facebook, Flickr, and so on... -->
+	<!-- SLShare: Facebook, Flickr, and Twitter -->
   <string name="SocialFacebookConnecting">Connecting to Facebook...</string>
   <string name="SocialFacebookPosting">Posting...</string>
   <string name="SocialFacebookDisconnecting">Disconnecting from Facebook...</string>
@@ -161,6 +161,12 @@ Please try logging in again in a minute.</string>
   <string name="SocialFlickrErrorConnecting">Problem connecting to Flickr</string>
   <string name="SocialFlickrErrorPosting">Problem posting to Flickr</string>
   <string name="SocialFlickrErrorDisconnecting">Problem disconnecting from Flickr</string>
+  <string name="SocialTwitterConnecting">Connecting to Twitter...</string>
+  <string name="SocialTwitterPosting">Posting...</string>
+  <string name="SocialTwitterDisconnecting">Disconnecting from Twitter...</string>
+  <string name="SocialTwitterErrorConnecting">Problem connecting to Twitter</string>
+  <string name="SocialTwitterErrorPosting">Problem posting to Twitter</string>
+  <string name="SocialTwitterErrorDisconnecting">Problem disconnecting from Twitter</string>
     
 	<!-- Tooltip -->
 	<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
-- 
cgit v1.2.3


From be23aaefe53cd245752d3973bf930c87f67c6253 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Thu, 7 Nov 2013 01:30:36 +0000
Subject: added title, descriptions, tags, and safety level to
 panel_flickr_photo.xml for ACME-1142

---
 .../skins/default/xui/en/floater_flickr.xml        |  6 +-
 .../skins/default/xui/en/panel_flickr_account.xml  |  2 +-
 .../skins/default/xui/en/panel_flickr_photo.xml    | 98 ++++++++++++++++++++--
 .../skins/default/xui/en/panel_twitter_photo.xml   |  2 +-
 4 files changed, 94 insertions(+), 14 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_flickr.xml b/indra/newview/skins/default/xui/en/floater_flickr.xml
index 441e3ee73d..57014f8427 100644
--- a/indra/newview/skins/default/xui/en/floater_flickr.xml
+++ b/indra/newview/skins/default/xui/en/floater_flickr.xml
@@ -10,10 +10,10 @@
   single_instance="true"
   reuse_instance="true"
   title="UPLOAD TO FLICKR"
-  height="482"
+  height="622"
   width="304">
   <panel
-   height="482"
+   height="622"
    width="304"
    visible="true"
    name="background"
@@ -27,7 +27,7 @@
      tab_height="30"
      tab_position="top"
      top="7"
-     height="437"
+     height="577"
      halign="center">
      <panel
        filename="panel_flickr_photo.xml"
diff --git a/indra/newview/skins/default/xui/en/panel_flickr_account.xml b/indra/newview/skins/default/xui/en/panel_flickr_account.xml
index c76a42904b..3a38852049 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_account.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_account.xml
@@ -1,5 +1,5 @@
 <panel
-	 height="400"
+	 height="540"
 	 width="304"
 	 layout="topleft"
    name="panel_flickr_account">
diff --git a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
index 1fc4927ac2..d7d3fb6c1b 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -1,19 +1,19 @@
     <panel
-      height="400"
+      height="540"
       width="304"
       layout="topleft"
       name="panel_flickr_photo">
       <layout_stack
 	   layout="topleft"
        border_size="0"
-       height="392"
+       height="532"
        follows="all"
        orientation="vertical"
        name="stack_photo"
        top="8">
         <layout_panel	
          name="snapshot_panel"
-         height="367">
+         height="507">
             <combo_box
              control_name="SocialPhotoResolution"
              follows="left|top"
@@ -97,30 +97,110 @@
              font="SansSerif"
              height="16"
              left="9"
-             name="caption_label"
+             name="title_label"
              top_pad="20"
              type="string">
-              Comment (optional):
+              Title:
             </text>
             <text_editor
              follows="left|top"
-             height="87"
+             height="20"
+             width="250"
+             left="9"
+             length="1"
+             max_length="256"
+             name="photo_title"
+             type="string"
+             word_wrap="true">
+            </text_editor>
+            <text
+             length="1"
+             follows="top|left|right"
+             font="SansSerif"
+             height="16"
+             left="9"
+             name="description_label"
+             top_pad="10"
+             type="string">
+              Description:
+            </text>
+            <text_editor
+             follows="left|top"
+             height="50"
              width="250"
              left="9"
              length="1"
              max_length="700"
-             name="photo_caption"
+             name="photo_description"
              type="string"
              word_wrap="true">
             </text_editor>
             <check_box
              follows="left|top"
              initial_value="true"
-             label="Include location in posting"
+             label="Include SL location at end of description"
              name="add_location_cb"
               left="9"
               height="16"
              top_pad="8"/>
+            <text
+             length="1"
+             follows="top|left|right"
+             font="SansSerif"
+             height="16"
+             left="9"
+             name="tags_label"
+             top_pad="10"
+             type="string">
+              Tags:
+            </text>
+            <text
+              length="1"
+              follows="top|left"
+              font="SansSerifSmall"
+              text_color="White_50"
+              height="30"
+              name="tags_help_label"
+              left="50"
+              top_pad="-16"
+              type="string">
+Separate tags with spaces
+Use "" for multi-word tags
+            </text>
+            <text_editor
+             follows="left|top"
+             height="50"
+             width="250"
+             left="9"
+             length="1"
+             max_length="700"
+             name="photo_tags"
+             type="string"
+             word_wrap="true">
+            </text_editor>
+            <combo_box
+             control_name="FlickrPhotoRating"
+             follows="left|top"
+             top_pad="16"
+             left="9"
+             label="Choose Flickr rating (required)..."
+             name="rating_combobox"
+             tool_tip="Flickr content rating"
+             height="21"
+             width="250">
+              <combo_box.item
+               label="Safe"
+               name="SafeRating"
+               value="1" />
+              <combo_box.item
+               label="Moderate"
+               name="ModerateRating"
+               value="2" />
+              <combo_box.item
+               label="Restricted"
+               name="RestrictedRating"
+               value="3" />
+            </combo_box>
         </layout_panel>
         <layout_panel
           name="photo_button_panel"
@@ -130,7 +210,7 @@
            top="0"
            left="9"
            height="23"
-           label="Post"
+           label="Upload"
            name="post_photo_btn"
            width="100">
             <button.commit_callback
diff --git a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
index 058c65402a..540bc0f807 100644
--- a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
@@ -130,7 +130,7 @@
            top="0"
            left="9"
            height="23"
-           label="Post"
+           label="Tweet"
            name="post_photo_btn"
            width="100">
             <button.commit_callback
-- 
cgit v1.2.3


From 389ddfd5add78998aaadb171593b5b036d2dbee0 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Thu, 7 Nov 2013 19:06:39 +0000
Subject: updated panel_twitter_photo.xml to match design spec for ACME-1153

---
 .../skins/default/xui/en/panel_twitter_photo.xml   | 70 ++++++++++++----------
 1 file changed, 37 insertions(+), 33 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
index 540bc0f807..84206c608b 100644
--- a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
@@ -11,9 +11,43 @@
        orientation="vertical"
        name="stack_photo"
        top="8">
-        <layout_panel	
-         name="snapshot_panel"
-         height="367">
+        <layout_panel
+         name="text_panel"
+         height="140">
+          <text
+           length="1"
+           follows="top|left|right"
+           font="SansSerif"
+           height="16"
+           left="9"
+           name="status_label"
+           top="3"
+           type="string">
+            What's happening?
+          </text>
+          <text_editor
+           follows="left|top"
+           height="87"
+           width="250"
+           left="9"
+           length="1"
+           max_length="700"
+           name="photo_status"
+           type="string"
+           word_wrap="true">
+          </text_editor>
+          <check_box
+           follows="left|top"
+           initial_value="true"
+           label="Include a photo"
+           name="add_photo_cb"
+            left="9"
+            height="16"
+           top_pad="10"/>
+        </layout_panel>
+          <layout_panel
+           name="snapshot_panel"
+           height="227">
             <combo_box
              control_name="SocialPhotoResolution"
              follows="left|top"
@@ -91,36 +125,6 @@
                 width="150">
                 Refreshing...
             </text>
-            <text
-             length="1"
-             follows="top|left|right"
-             font="SansSerif"
-             height="16"
-             left="9"
-             name="caption_label"
-             top_pad="20"
-             type="string">
-              Comment (optional):
-            </text>
-            <text_editor
-             follows="left|top"
-             height="87"
-             width="250"
-             left="9"
-             length="1"
-             max_length="700"
-             name="photo_caption"
-             type="string"
-             word_wrap="true">
-            </text_editor>
-            <check_box
-             follows="left|top"
-             initial_value="true"
-             label="Include location in posting"
-             name="add_location_cb"
-              left="9"
-              height="16"
-             top_pad="8"/>
         </layout_panel>
         <layout_panel
           name="photo_button_panel"
-- 
cgit v1.2.3


From 15434d53ea1f1bca37b7b9d6d569b3cb61d09bbe Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Fri, 8 Nov 2013 00:33:14 +0000
Subject: added SLShare links to snapshot floater for ACME-1167

---
 .../skins/default/xui/en/floater_snapshot.xml      |  2 +-
 .../default/xui/en/panel_snapshot_options.xml      | 36 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 853c209bca..019ddad33c 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -10,7 +10,7 @@
  help_topic="snapshot"
  save_rect="true"
  save_visibility="false"
- title="SNAPSHOT PREVIEW"
+ title="SNAPSHOT"
  width="470">
     <floater.string
      name="unknown">
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
index 61c8c971c2..eff60f8228 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
@@ -81,4 +81,40 @@
     <button.commit_callback
      function="Snapshot.SaveToComputer" />
   </button>
+  <text
+    font="SansSerif"
+    layout="topleft"
+    length="1"
+    follows="top|left"
+    height="16"
+    left="10"
+    name="send_to_facebook_textbox"
+    top_pad="10"
+    type="string">
+    Send to:  [secondlife:/// Facebook]
+  </text>
+  <text
+    font="SansSerif"
+    layout="topleft"
+    length="1"
+    follows="top|left"
+    height="16"
+    left="140"
+    name="send_to_twitter_textbox"
+    top_pad="-16"
+    type="string">
+    [secondlife:/// Twitter]
+  </text>
+  <text
+    font="SansSerif"
+    layout="topleft"
+    length="1"
+    follows="top|left"
+    height="16"
+    left="190"
+    name="send_to_flickr_textbox"
+    top_pad="-16"
+    type="string">
+    [secondlife:/// Flickr]
+  </text>
 </panel>
-- 
cgit v1.2.3


From 86442d1f8beae66890231c12ddc1cd9e1f1a6170 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 12 Nov 2013 01:43:00 +0000
Subject: added Flickr and Twitter FUI buttons for ACME-1179

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 2b707ed84b..b24cca588e 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3893,6 +3893,8 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Search_Label">Search</string>
   <string name="Command_Snapshot_Label">Snapshot</string>
   <string name="Command_Social_Label">Facebook</string>
+  <string name="Command_Flickr_Label">Flickr</string>
+  <string name="Command_Twitter_Label">Twitter</string>
   <string name="Command_Speak_Label">Speak</string>
   <string name="Command_View_Label">Camera controls</string>
   <string name="Command_Voice_Label">Voice settings</string>
@@ -3921,6 +3923,8 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Search_Tooltip">Find places, events, people</string>
   <string name="Command_Snapshot_Tooltip">Take a picture</string>
   <string name="Command_Social_Tooltip">Post to Facebook</string>
+  <string name="Command_Flickr_Tooltip">Upload to Flickr</string>
+  <string name="Command_Twitter_Tooltip">Twitter</string>
   <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string>
   <string name="Command_View_Tooltip">Changing camera angle</string>
   <string name="Command_Voice_Tooltip">Volume controls for calls and people near you in world</string>
-- 
cgit v1.2.3


From a718b0d182dd35bdb01973eb3108e8b4a58a627c Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 12 Nov 2013 18:04:23 +0000
Subject: updated Flickr photo upload UI content rating text for ACME-1178

---
 indra/newview/skins/default/xui/en/panel_flickr_photo.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
index d7d3fb6c1b..39935a7687 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -189,15 +189,15 @@ Use "" for multi-word tags
              height="21"
              width="250">
               <combo_box.item
-               label="Safe"
+               label="Safe content rating"
                name="SafeRating"
                value="1" />
               <combo_box.item
-               label="Moderate"
+               label="Moderate content rating"
                name="ModerateRating"
                value="2" />
               <combo_box.item
-               label="Restricted"
+               label="Restricted content rating"
                name="RestrictedRating"
                value="3" />
             </combo_box>
-- 
cgit v1.2.3


From 9946965c4decd59793adcaa39c70dbf9778d61dd Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 12 Nov 2013 20:07:54 +0000
Subject: replaced Flickr and Twitter FUI icons for ACME-1181

---
 indra/newview/skins/default/textures/textures.xml       |   2 ++
 .../skins/default/textures/toolbar_icons/flickr.png     | Bin 0 -> 15530 bytes
 .../skins/default/textures/toolbar_icons/twitter.png    | Bin 0 -> 16051 bytes
 3 files changed, 2 insertions(+)
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/flickr.png
 create mode 100644 indra/newview/skins/default/textures/toolbar_icons/twitter.png

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 94c187e21a..e42743824e 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -149,6 +149,8 @@ with the same filename but different name
   <texture name="Command_Profile_Icon"      file_name="toolbar_icons/profile.png"      preload="true" />
   <texture name="Command_Search_Icon"       file_name="toolbar_icons/search.png"       preload="true" />
   <texture name="Command_Social_Icon"       file_name="toolbar_icons/facebook.png"     preload="true" />
+  <texture name="Command_Flickr_Icon"       file_name="toolbar_icons/flickr.png"     preload="true" />
+  <texture name="Command_Twitter_Icon"      file_name="toolbar_icons/twitter.png"     preload="true" />
   <texture name="Command_Snapshot_Icon"     file_name="toolbar_icons/snapshot.png"     preload="true" />
   <texture name="Command_Speak_Icon"        file_name="toolbar_icons/speak.png"        preload="true" />
   <texture name="Command_View_Icon"         file_name="toolbar_icons/view.png"         preload="true" />
diff --git a/indra/newview/skins/default/textures/toolbar_icons/flickr.png b/indra/newview/skins/default/textures/toolbar_icons/flickr.png
new file mode 100644
index 0000000000..7fce9f0df2
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/flickr.png differ
diff --git a/indra/newview/skins/default/textures/toolbar_icons/twitter.png b/indra/newview/skins/default/textures/toolbar_icons/twitter.png
new file mode 100644
index 0000000000..a99c490887
Binary files /dev/null and b/indra/newview/skins/default/textures/toolbar_icons/twitter.png differ
-- 
cgit v1.2.3


From 9e6dd1811e890d6d5e23059c67f13d9960e56366 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 12 Nov 2013 22:18:05 +0000
Subject: implemented Twitter character limits for status text box for
 ACME-1171 and ACME-1172

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
index 84206c608b..fd2bffe675 100644
--- a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
@@ -31,7 +31,7 @@
            width="250"
            left="9"
            length="1"
-           max_length="700"
+           max_length="119"
            name="photo_status"
            type="string"
            word_wrap="true">
-- 
cgit v1.2.3


From 19c1be0e055bd06cb3083a9c9d126a4907a90788 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Tue, 12 Nov 2013 22:37:24 +0000
Subject: replaced Flickr title text_editor to a line_editor for ACME-1169

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
index 39935a7687..b3af271f34 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -102,7 +102,7 @@
              type="string">
               Title:
             </text>
-            <text_editor
+            <line_editor
              follows="left|top"
              height="20"
              width="250"
@@ -110,9 +110,8 @@
              length="1"
              max_length="256"
              name="photo_title"
-             type="string"
-             word_wrap="true">
-            </text_editor>
+             type="string">
+            </line_editor>
             <text
              length="1"
              follows="top|left|right"
-- 
cgit v1.2.3


From 47918f4537ee924c4cb9652a72561b5febbddeb6 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 13 Nov 2013 18:44:33 +0000
Subject: changed Twitter photo character limit to 100 just to be safe, and
 switched to use cap server for Flickr and Twitter service

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
index fd2bffe675..8e2412c84e 100644
--- a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
@@ -31,7 +31,7 @@
            width="250"
            left="9"
            length="1"
-           max_length="119"
+           max_length="140"
            name="photo_status"
            type="string"
            word_wrap="true">
-- 
cgit v1.2.3


From b6d02ae9c84e185f2507323c47c0475ce43f9e7a Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 4 Dec 2013 18:19:47 +0000
Subject: Added SLURL checkbox to floater_twitter for ACME-1216

---
 indra/newview/skins/default/xui/en/floater_twitter.xml     |  6 +++---
 indra/newview/skins/default/xui/en/panel_twitter_photo.xml | 14 +++++++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_twitter.xml b/indra/newview/skins/default/xui/en/floater_twitter.xml
index 7007a14cdb..751914141c 100644
--- a/indra/newview/skins/default/xui/en/floater_twitter.xml
+++ b/indra/newview/skins/default/xui/en/floater_twitter.xml
@@ -10,10 +10,10 @@
   single_instance="true"
   reuse_instance="true"
   title="TWITTER"
-  height="482"
+  height="502"
   width="304">
   <panel
-   height="482"
+   height="502"
    width="304"
    visible="true"
    name="background"
@@ -27,7 +27,7 @@
      tab_height="30"
      tab_position="top"
      top="7"
-     height="437"
+     height="457"
      halign="center">
      <panel
        filename="panel_twitter_photo.xml"
diff --git a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
index 8e2412c84e..3ddec9b989 100644
--- a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
@@ -1,19 +1,19 @@
     <panel
-      height="400"
+      height="420"
       width="304"
       layout="topleft"
       name="panel_twitter_photo">
       <layout_stack
 	   layout="topleft"
        border_size="0"
-       height="392"
+       height="412"
        follows="all"
        orientation="vertical"
        name="stack_photo"
        top="8">
         <layout_panel
          name="text_panel"
-         height="140">
+         height="160">
           <text
            length="1"
            follows="top|left|right"
@@ -36,6 +36,14 @@
            type="string"
            word_wrap="true">
           </text_editor>
+          <check_box
+           follows="left|top"
+           initial_value="true"
+           label="Include SL location"
+           name="add_location_cb"
+            left="9"
+            height="16"
+           top_pad="10"/>
           <check_box
            follows="left|top"
            initial_value="true"
-- 
cgit v1.2.3


From 187fb979d365ac3052f6a95e278a1f92c3117d17 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 4 Dec 2013 19:45:26 +0000
Subject: Add character count display to floater_twitter for ACME-1215

---
 indra/newview/skins/default/xui/en/panel_twitter_photo.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
index 3ddec9b989..14268c1bcf 100644
--- a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
@@ -25,6 +25,20 @@
            type="string">
             What's happening?
           </text>
+          <text
+           length="1"
+           follows="top|left"
+           font="SansSerif"
+           text_color="EmphasisColor"
+           halign="right"
+           height="16"
+           width="30"
+           left="227"
+           name="status_counter_label"
+           top="3"
+           type="string">
+            140
+          </text>
           <text_editor
            follows="left|top"
            height="87"
-- 
cgit v1.2.3


From 9108354e9d39d93dadbad34ff5ba7ecb7abc7bf9 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Thu, 5 Dec 2013 00:28:28 +0000
Subject: Renamed floater_social to floater_facebook for ACME-1205

---
 indra/newview/skins/default/textures/textures.xml  |   6 +-
 .../skins/default/xui/en/floater_facebook.xml      | 101 ++++++++++++++
 .../skins/default/xui/en/floater_social.xml        | 101 --------------
 indra/newview/skins/default/xui/en/menu_viewer.xml |   2 +-
 .../default/xui/en/panel_facebook_account.xml      |  75 ++++++++++
 .../skins/default/xui/en/panel_facebook_photo.xml  | 152 +++++++++++++++++++++
 .../skins/default/xui/en/panel_facebook_place.xml  | 132 ++++++++++++++++++
 .../skins/default/xui/en/panel_facebook_status.xml |  67 +++++++++
 .../skins/default/xui/en/panel_social_account.xml  |  75 ----------
 .../skins/default/xui/en/panel_social_photo.xml    | 152 ---------------------
 .../skins/default/xui/en/panel_social_place.xml    | 132 ------------------
 .../skins/default/xui/en/panel_social_status.xml   |  67 ---------
 indra/newview/skins/default/xui/en/strings.xml     |  12 +-
 13 files changed, 537 insertions(+), 537 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_facebook.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_social.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_facebook_account.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_facebook_photo.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_facebook_place.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_facebook_status.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_social_account.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_social_photo.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_social_place.xml
 delete mode 100644 indra/newview/skins/default/xui/en/panel_social_status.xml

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

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index e42743824e..751558fc93 100755
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -133,6 +133,8 @@ with the same filename but different name
   <texture name="Command_Chat_Icon"         file_name="toolbar_icons/chat.png"         preload="true" />
   <texture name="Command_Compass_Icon"      file_name="toolbar_icons/land.png"         preload="true" />
   <texture name="Command_Destinations_Icon" file_name="toolbar_icons/destinations.png" preload="true" />
+  <texture name="Command_Facebook_Icon"     file_name="toolbar_icons/facebook.png"     preload="true" />
+  <texture name="Command_Flickr_Icon"       file_name="toolbar_icons/flickr.png"       preload="true" />
   <texture name="Command_Gestures_Icon"     file_name="toolbar_icons/gestures.png"     preload="true" />
   <texture name="Command_HowTo_Icon"        file_name="toolbar_icons/howto.png"        preload="true" />
   <texture name="Command_Inventory_Icon"    file_name="toolbar_icons/inventory.png"    preload="true" />
@@ -148,11 +150,9 @@ with the same filename but different name
   <texture name="Command_Preferences_Icon"  file_name="toolbar_icons/preferences.png"  preload="true" />
   <texture name="Command_Profile_Icon"      file_name="toolbar_icons/profile.png"      preload="true" />
   <texture name="Command_Search_Icon"       file_name="toolbar_icons/search.png"       preload="true" />
-  <texture name="Command_Social_Icon"       file_name="toolbar_icons/facebook.png"     preload="true" />
-  <texture name="Command_Flickr_Icon"       file_name="toolbar_icons/flickr.png"     preload="true" />
-  <texture name="Command_Twitter_Icon"      file_name="toolbar_icons/twitter.png"     preload="true" />
   <texture name="Command_Snapshot_Icon"     file_name="toolbar_icons/snapshot.png"     preload="true" />
   <texture name="Command_Speak_Icon"        file_name="toolbar_icons/speak.png"        preload="true" />
+  <texture name="Command_Twitter_Icon"      file_name="toolbar_icons/twitter.png"      preload="true" />
   <texture name="Command_View_Icon"         file_name="toolbar_icons/view.png"         preload="true" />
   <texture name="Command_Voice_Icon"        file_name="toolbar_icons/nearbyvoice.png"  preload="true" />
   <texture name="Caret_Bottom_Icon"         file_name="toolbar_icons/caret_bottom.png" preload="true" scale.left="1" scale.top="23" scale.right="15" scale.bottom="1" />
diff --git a/indra/newview/skins/default/xui/en/floater_facebook.xml b/indra/newview/skins/default/xui/en/floater_facebook.xml
new file mode 100644
index 0000000000..820e105e53
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_facebook.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<floater
+  positioning="cascading"
+  can_close="true"
+  can_resize="false"
+  help_topic="floater_facebook"
+  layout="topleft"
+  name="floater_facebook"
+  save_rect="true"
+  single_instance="true"
+  reuse_instance="true"
+  title="POST TO FACEBOOK"
+  height="482"
+  width="304">
+  <panel
+   height="482"
+   width="304"
+   visible="true"
+   name="background"
+   follows="all"
+   top="0"
+   left="0">
+   <tab_container
+     name="tabs"
+     tab_group="1"
+     tab_min_width="70"
+     tab_height="30"
+     tab_position="top"
+     top="7"
+     height="437"
+     halign="center">
+     <panel
+       filename="panel_facebook_status.xml"
+       class="llfacebookstatuspanel"
+       follows="all"
+       label="STATUS"
+       name="panel_facebook_status"/>
+     <panel
+       filename="panel_facebook_photo.xml"
+       class="llfacebookphotopanel"
+       follows="all"
+       label="PHOTO"
+       name="panel_facebook_photo"/>
+     <panel
+       filename="panel_facebook_place.xml"
+       class="llfacebookcheckinpanel"
+       follows="all"
+       label="CHECK IN"
+       name="panel_facebook_place"/>
+     <panel
+       filename="panel_facebook_account.xml"
+       class="llfacebookaccountpanel"
+       follows="all"
+       label="ACCOUNT"
+       name="panel_facebook_account"/>     
+    </tab_container>
+    <panel
+     name="connection_status_panel"
+     follows="left|bottom|right"
+     height="24">
+     <text
+      name="connection_error_text"
+      type="string"
+      follows="left|bottom|right"
+      top="5"
+      left="9"
+      width="250"
+      height="20"
+      wrap="true"
+      halign="left"
+      valign="center"
+      text_color="DrYellow"
+      font="SansSerif">
+      Error
+     </text>
+     <loading_indicator
+      follows="left|bottom|right"
+      height="24"
+      width="24"
+      name="connection_loading_indicator"
+      top="2"
+      left="9"
+      visible="true"/>
+     <text
+      name="connection_loading_text"
+      type="string"
+      follows="left|bottom|right"
+      top="5"
+      left_pad="5"
+      width="250"
+      height="20"
+      wrap="true"
+      halign="left"
+      valign="center"
+      text_color="EmphasisColor"
+      font="SansSerif">
+      Loading...
+    </text>
+  </panel>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
deleted file mode 100644
index b7ff374d5f..0000000000
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<floater
-  positioning="cascading"
-  can_close="true"
-  can_resize="false"
-  help_topic="floater_social"
-  layout="topleft"
-  name="floater_social"
-  save_rect="true"
-  single_instance="true"
-  reuse_instance="true"
-  title="POST TO FACEBOOK"
-  height="482"
-  width="304">
-  <panel
-   height="482"
-   width="304"
-   visible="true"
-   name="background"
-   follows="all"
-   top="0"
-   left="0">
-   <tab_container
-     name="tabs"
-     tab_group="1"
-     tab_min_width="70"
-     tab_height="30"
-     tab_position="top"
-     top="7"
-     height="437"
-     halign="center">
-     <panel
-       filename="panel_social_status.xml"
-       class="llsocialstatuspanel"
-       follows="all"
-       label="STATUS"
-       name="panel_social_status"/>
-     <panel
-       filename="panel_social_photo.xml"
-       class="llsocialphotopanel"
-       follows="all"
-       label="PHOTO"
-       name="panel_social_photo"/>
-     <panel
-       filename="panel_social_place.xml"
-       class="llsocialcheckinpanel"
-       follows="all"
-       label="CHECK IN"
-       name="panel_social_place"/>
-     <panel
-       filename="panel_social_account.xml"
-       class="llsocialaccountpanel"
-       follows="all"
-       label="ACCOUNT"
-       name="panel_social_account"/>     
-    </tab_container>
-    <panel
-     name="connection_status_panel"
-     follows="left|bottom|right"
-     height="24">
-     <text
-      name="connection_error_text"
-      type="string"
-      follows="left|bottom|right"
-      top="5"
-      left="9"
-      width="250"
-      height="20"
-      wrap="true"
-      halign="left"
-      valign="center"
-      text_color="DrYellow"
-      font="SansSerif">
-      Error
-     </text>
-     <loading_indicator
-      follows="left|bottom|right"
-      height="24"
-      width="24"
-      name="connection_loading_indicator"
-      top="2"
-      left="9"
-      visible="true"/>
-     <text
-      name="connection_loading_text"
-      type="string"
-      follows="left|bottom|right"
-      top="5"
-      left_pad="5"
-      width="250"
-      height="20"
-      wrap="true"
-      halign="left"
-      valign="center"
-      text_color="EmphasisColor"
-      font="SansSerif">
-      Loading...
-    </text>
-  </panel>
- </panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 79adb4e8bb..905988e09d 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -285,7 +285,7 @@
         name="Facebook">
         <menu_item_call.on_click
           function="Floater.Toggle"
-          parameter="social"/>
+          parameter="facebook"/>
       </menu_item_call>
       <menu_item_call
         label="Twitter..."
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_account.xml b/indra/newview/skins/default/xui/en/panel_facebook_account.xml
new file mode 100644
index 0000000000..f091d2e9b9
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_facebook_account.xml
@@ -0,0 +1,75 @@
+<panel
+	 height="400"
+	 width="304"
+	 layout="topleft"
+   name="panel_facebook_account">
+  <string
+      name="facebook_connected"
+      value="You are connected to Facebook as:" />
+  <string
+      name="facebook_disconnected"
+      value="Not connected to Facebook" />
+  <text
+   layout="topleft"
+   length="1"
+   follows="top|left"
+   font="SansSerif"
+   height="16"
+   left="9"
+   name="account_caption_label"
+   top="21"
+   type="string">
+    Not connected to Facebook.
+  </text>
+  <text
+   layout="topleft"
+   top_pad="2"
+   length="1"
+   follows="top|left"
+   font="SansSerif"
+   height="16"
+   left="9"
+   name="account_name_label"
+   parse_urls="true"
+   type="string"/>
+  <panel
+    layout="topleft"
+    name="panel_buttons"
+    height="345"
+    left="9">
+    <button
+     layout="topleft"
+     follows="left|top"
+     top_pad="9"
+     visible="true"
+     height="23"
+     label="Connect..."
+     name="connect_btn"
+     width="210">
+      <commit_callback function="SocialSharing.Connect"/>
+    </button>
+
+    <button
+     layout="topleft"
+     follows="left|top"
+     top_delta="0"
+     height="23"
+     label="Disconnect"
+     name="disconnect_btn"
+     width="210"
+     visible="false">
+      <commit_callback function="SocialSharing.Disconnect"/>
+    </button>
+    <text
+      layout="topleft"
+      length="1"
+      follows="top|left"
+      height="16"
+      left="0"
+      name="account_learn_more_label"
+      top_pad="20"
+      type="string">
+      [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share/ta-p/2149711 Learn about posting to Facebook]
+    </text>
+  </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
new file mode 100644
index 0000000000..19f9f2fb74
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
@@ -0,0 +1,152 @@
+    <panel
+      height="400"
+      width="304"
+      layout="topleft"
+      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="SocialPhotoResolution"
+             follows="left|top"
+             top="6"
+             left="9"
+             name="resolution_combobox"
+             tool_tip="Image resolution"
+             height="21"
+             width="135">
+              <combo_box.item
+               label="Current Window"
+               name="CurrentWindow"
+               value="[i0,i0]" />
+              <combo_box.item
+               label="640x480"
+               name="640x480"
+               value="[i640,i480]" />
+              <combo_box.item
+               label="800x600"
+               name="800x600"
+               value="[i800,i600]" />
+              <combo_box.item
+               label="1024x768"
+               name="1024x768"
+               value="[i1024,i768]" />
+            </combo_box>
+            <text
+             follows="left|top"
+             font="SansSerifSmall"
+             height="14"
+             left="208"
+             length="1"
+             halign="right"
+             name="file_size_label"
+             top="9"
+             type="string"
+             width="50">
+              [SIZE] KB
+            </text>
+            <panel
+                height="150"
+                width="250"
+                visible="true"
+                name="thumbnail_placeholder"
+                top="33"
+                follows="left|top"
+                left="9">
+            </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
+                follows="left|top"
+                font="SansSerif"
+                text_color="EmphasisColor"
+                height="14"
+                top_pad="-19"
+                left_pad="-20"
+                length="1"
+                halign="center"
+                name="working_lbl"
+                translate="false"
+                type="string"
+                visible="true"
+                width="150">
+                Refreshing...
+            </text>
+            <text
+             length="1"
+             follows="top|left|right"
+             font="SansSerif"
+             height="16"
+             left="9"
+             name="caption_label"
+             top_pad="20"
+             type="string">
+              Comment (optional):
+            </text>
+            <text_editor
+             follows="left|top"
+             height="87"
+             width="250"
+             left="9"
+             length="1"
+             max_length="700"
+             name="photo_caption"
+             type="string"
+             word_wrap="true">
+            </text_editor>
+            <check_box
+             follows="left|top"
+             initial_value="true"
+             label="Include location in posting"
+             name="add_location_cb"
+              left="9"
+              height="16"
+             top_pad="8"/>
+        </layout_panel>
+        <layout_panel
+          name="photo_button_panel"
+          height="25">
+          <button
+           follows="left|top"
+           top="0"
+           left="9"
+           height="23"
+           label="Post"
+           name="post_photo_btn"
+           width="100">
+            <button.commit_callback
+             function="SocialSharing.SendPhoto" />
+          </button>
+          <button
+               follows="left|top"
+               height="23"
+               label="Cancel"
+               name="cancel_photo_btn"
+               left_pad="15"
+               top_delta="0"
+               width="100">
+            <button.commit_callback
+             function="SocialSharing.Cancel" />
+          </button>          
+        </layout_panel>        
+      </layout_stack>
+    </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_place.xml b/indra/newview/skins/default/xui/en/panel_facebook_place.xml
new file mode 100644
index 0000000000..1eea8f317b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_facebook_place.xml
@@ -0,0 +1,132 @@
+    <panel
+      height="400"
+      width="304"
+	  layout="topleft"
+      name="panel_facebook_place">
+      <layout_stack
+	    layout="topleft"
+        border_size="0"
+        height="392"
+        follows="all"
+        orientation="vertical"
+        name="stack_place"
+        top="8">
+        <layout_panel
+          name="place_detail_panel"
+          height="181">
+          <text
+            length="1"
+            follows="top|left|right"
+            font="SansSerif"
+            height="16"
+            left="9"
+            name="place_caption_label"
+            top="13"
+            type="string">
+            Say something about where you are:
+          </text>
+          <text_editor
+            follows="top|left"
+            height="150"
+            width="250"
+            left="9"
+            length="1"
+            max_length="700"
+            name="place_caption"
+            type="string"
+            word_wrap="true">
+           </text_editor>
+          </layout_panel>
+          <layout_panel
+            name="place_map_panel"
+            height="186">
+              <panel
+                  follows="left|top"
+                  height="128"
+                  width="128"
+                  background_visible="true"
+                  bg_opaque_color="Black"
+                  bg_alpha_color="Black"
+                  top="20"
+                  left="9"
+                  visible="true"
+                  name="map_border">
+              </panel>
+              <loading_indicator
+              follows="left|top"
+              height="24"
+              width="24"
+              name="map_loading_indicator"
+              top="77"
+              left="61"
+              visible="true"/>
+              <icon
+                follows="left|top"
+                height="128"
+                width="128"
+                image_name="Map_Placeholder_Icon"
+                layout="topleft"
+                top="20"
+                left="9"
+                visible="true"
+                name="map_placeholder">
+              </icon>
+              <icon
+                  follows="left|top"
+                  height="128"
+                  width="128"
+                  image_name="Map_Placeholder_Icon"
+                  layout="topleft"
+                  top="20"
+                  left="9"
+                  visible="true"
+                  name="map_default">
+              </icon>
+            <check_box
+              follows="left|top"
+              initial_value="false"
+              top_delta="8"
+              width="8"
+              label=""
+              name="add_place_view_cb"
+              left_pad="5"/>
+            <text
+              follows="left|top"
+              font="SansSerif"
+              height="32"
+              width="130"
+              word_wrap="true"
+              left_pad="12"
+              top_delta="-8"
+              type="string">
+              Include overhead view of location
+            </text>
+          </layout_panel>
+          <layout_panel
+            name="place_button_panel"
+            height="25">
+            <button
+              follows="left|top"
+              top="0"
+              left="9"
+              height="23"
+              label="Post"
+              name="post_place_btn"
+              width="100">
+              <button.commit_callback
+                 function="SocialSharing.SendCheckin" />
+            </button>
+            <button
+              follows="left|top"
+              height="23"
+              label="Cancel"
+              name="cancel_place_btn"
+              left_pad="15"
+              top_delta="0"
+              width="100">
+              <button.commit_callback
+                  function="SocialSharing.Cancel" />
+            </button>
+        </layout_panel>
+     </layout_stack>
+    </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_status.xml b/indra/newview/skins/default/xui/en/panel_facebook_status.xml
new file mode 100644
index 0000000000..50e15c2e80
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_facebook_status.xml
@@ -0,0 +1,67 @@
+    <panel
+	 height="400"
+	 width="304"
+	 layout="topleft"
+     name="panel_facebook_status">
+     <layout_stack
+      layout="topleft"
+      border_size="0"
+      height="392"
+      follows="all"
+      orientation="vertical"
+      name="stack_status"
+      top="8">
+      <layout_panel
+       name="status_detail_panel"
+       height="367">
+       <text
+        length="1"
+        follows="top|left|right"
+        font="SansSerif"
+        height="16"
+        left="9"
+        name="status_caption_label"
+        top="13"
+        type="string">
+        What's on your mind?
+       </text>
+       <text_editor
+        follows="left|top"
+        height="150"
+        width="250"
+        left="9"
+        length="1"
+        max_length="700"
+        name="status_message"
+        type="string"
+        word_wrap="true">
+       </text_editor>
+      </layout_panel>
+      <layout_panel
+       name="status_button_panel"
+       height="25">
+       <button
+        follows="left|top"
+        top="0"
+        left="9"
+        height="23"
+        label="Post"
+        name="post_status_btn"
+        width="100">
+        <button.commit_callback
+          function="SocialSharing.SendStatus" />
+       </button>
+       <button
+        follows="left|top"
+        height="23"
+        label="Cancel"
+        name="cancel_status_btn"
+        left_pad="15"
+        top_delta="0"
+        width="100">
+        <button.commit_callback
+          function="SocialSharing.Cancel" />
+       </button>
+      </layout_panel>
+     </layout_stack>
+    </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_social_account.xml b/indra/newview/skins/default/xui/en/panel_social_account.xml
deleted file mode 100644
index d7235396fe..0000000000
--- a/indra/newview/skins/default/xui/en/panel_social_account.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<panel
-	 height="400"
-	 width="304"
-	 layout="topleft"
-   name="panel_social_account">
-  <string
-      name="facebook_connected"
-      value="You are connected to Facebook as:" />
-  <string
-      name="facebook_disconnected"
-      value="Not connected to Facebook" />
-  <text
-   layout="topleft"
-   length="1"
-   follows="top|left"
-   font="SansSerif"
-   height="16"
-   left="9"
-   name="account_caption_label"
-   top="21"
-   type="string">
-    Not connected to Facebook.
-  </text>
-  <text
-   layout="topleft"
-   top_pad="2"
-   length="1"
-   follows="top|left"
-   font="SansSerif"
-   height="16"
-   left="9"
-   name="account_name_label"
-   parse_urls="true"
-   type="string"/>
-  <panel
-    layout="topleft"
-    name="panel_buttons"
-    height="345"
-    left="9">
-    <button
-     layout="topleft"
-     follows="left|top"
-     top_pad="9"
-     visible="true"
-     height="23"
-     label="Connect..."
-     name="connect_btn"
-     width="210">
-      <commit_callback function="SocialSharing.Connect"/>
-    </button>
-
-    <button
-     layout="topleft"
-     follows="left|top"
-     top_delta="0"
-     height="23"
-     label="Disconnect"
-     name="disconnect_btn"
-     width="210"
-     visible="false">
-      <commit_callback function="SocialSharing.Disconnect"/>
-    </button>
-    <text
-      layout="topleft"
-      length="1"
-      follows="top|left"
-      height="16"
-      left="0"
-      name="account_learn_more_label"
-      top_pad="20"
-      type="string">
-      [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share/ta-p/2149711 Learn about posting to Facebook]
-    </text>
-  </panel>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_social_photo.xml b/indra/newview/skins/default/xui/en/panel_social_photo.xml
deleted file mode 100644
index a55613b52a..0000000000
--- a/indra/newview/skins/default/xui/en/panel_social_photo.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-    <panel
-      height="400"
-      width="304"
-      layout="topleft"
-      name="panel_social_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="SocialPhotoResolution"
-             follows="left|top"
-             top="6"
-             left="9"
-             name="resolution_combobox"
-             tool_tip="Image resolution"
-             height="21"
-             width="135">
-              <combo_box.item
-               label="Current Window"
-               name="CurrentWindow"
-               value="[i0,i0]" />
-              <combo_box.item
-               label="640x480"
-               name="640x480"
-               value="[i640,i480]" />
-              <combo_box.item
-               label="800x600"
-               name="800x600"
-               value="[i800,i600]" />
-              <combo_box.item
-               label="1024x768"
-               name="1024x768"
-               value="[i1024,i768]" />
-            </combo_box>
-            <text
-             follows="left|top"
-             font="SansSerifSmall"
-             height="14"
-             left="208"
-             length="1"
-             halign="right"
-             name="file_size_label"
-             top="9"
-             type="string"
-             width="50">
-              [SIZE] KB
-            </text>
-            <panel
-                height="150"
-                width="250"
-                visible="true"
-                name="thumbnail_placeholder"
-                top="33"
-                follows="left|top"
-                left="9">
-            </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
-                follows="left|top"
-                font="SansSerif"
-                text_color="EmphasisColor"
-                height="14"
-                top_pad="-19"
-                left_pad="-20"
-                length="1"
-                halign="center"
-                name="working_lbl"
-                translate="false"
-                type="string"
-                visible="true"
-                width="150">
-                Refreshing...
-            </text>
-            <text
-             length="1"
-             follows="top|left|right"
-             font="SansSerif"
-             height="16"
-             left="9"
-             name="caption_label"
-             top_pad="20"
-             type="string">
-              Comment (optional):
-            </text>
-            <text_editor
-             follows="left|top"
-             height="87"
-             width="250"
-             left="9"
-             length="1"
-             max_length="700"
-             name="photo_caption"
-             type="string"
-             word_wrap="true">
-            </text_editor>
-            <check_box
-             follows="left|top"
-             initial_value="true"
-             label="Include location in posting"
-             name="add_location_cb"
-              left="9"
-              height="16"
-             top_pad="8"/>
-        </layout_panel>
-        <layout_panel
-          name="photo_button_panel"
-          height="25">
-          <button
-           follows="left|top"
-           top="0"
-           left="9"
-           height="23"
-           label="Post"
-           name="post_photo_btn"
-           width="100">
-            <button.commit_callback
-             function="SocialSharing.SendPhoto" />
-          </button>
-          <button
-               follows="left|top"
-               height="23"
-               label="Cancel"
-               name="cancel_photo_btn"
-               left_pad="15"
-               top_delta="0"
-               width="100">
-            <button.commit_callback
-             function="SocialSharing.Cancel" />
-          </button>          
-        </layout_panel>        
-      </layout_stack>
-    </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_social_place.xml b/indra/newview/skins/default/xui/en/panel_social_place.xml
deleted file mode 100644
index 13e94f6998..0000000000
--- a/indra/newview/skins/default/xui/en/panel_social_place.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-    <panel
-      height="400"
-      width="304"
-	  layout="topleft"
-      name="panel_social_place">
-      <layout_stack
-	    layout="topleft"
-        border_size="0"
-        height="392"
-        follows="all"
-        orientation="vertical"
-        name="stack_place"
-        top="8">
-        <layout_panel
-          name="place_detail_panel"
-          height="181">
-          <text
-            length="1"
-            follows="top|left|right"
-            font="SansSerif"
-            height="16"
-            left="9"
-            name="place_caption_label"
-            top="13"
-            type="string">
-            Say something about where you are:
-          </text>
-          <text_editor
-            follows="top|left"
-            height="150"
-            width="250"
-            left="9"
-            length="1"
-            max_length="700"
-            name="place_caption"
-            type="string"
-            word_wrap="true">
-           </text_editor>
-          </layout_panel>
-          <layout_panel
-            name="place_map_panel"
-            height="186">
-              <panel
-                  follows="left|top"
-                  height="128"
-                  width="128"
-                  background_visible="true"
-                  bg_opaque_color="Black"
-                  bg_alpha_color="Black"
-                  top="20"
-                  left="9"
-                  visible="true"
-                  name="map_border">
-              </panel>
-              <loading_indicator
-              follows="left|top"
-              height="24"
-              width="24"
-              name="map_loading_indicator"
-              top="77"
-              left="61"
-              visible="true"/>
-              <icon
-                follows="left|top"
-                height="128"
-                width="128"
-                image_name="Map_Placeholder_Icon"
-                layout="topleft"
-                top="20"
-                left="9"
-                visible="true"
-                name="map_placeholder">
-              </icon>
-              <icon
-                  follows="left|top"
-                  height="128"
-                  width="128"
-                  image_name="Map_Placeholder_Icon"
-                  layout="topleft"
-                  top="20"
-                  left="9"
-                  visible="true"
-                  name="map_default">
-              </icon>
-            <check_box
-              follows="left|top"
-              initial_value="false"
-              top_delta="8"
-              width="8"
-              label=""
-              name="add_place_view_cb"
-              left_pad="5"/>
-            <text
-              follows="left|top"
-              font="SansSerif"
-              height="32"
-              width="130"
-              word_wrap="true"
-              left_pad="12"
-              top_delta="-8"
-              type="string">
-              Include overhead view of location
-            </text>
-          </layout_panel>
-          <layout_panel
-            name="place_button_panel"
-            height="25">
-            <button
-              follows="left|top"
-              top="0"
-              left="9"
-              height="23"
-              label="Post"
-              name="post_place_btn"
-              width="100">
-              <button.commit_callback
-                 function="SocialSharing.SendCheckin" />
-            </button>
-            <button
-              follows="left|top"
-              height="23"
-              label="Cancel"
-              name="cancel_place_btn"
-              left_pad="15"
-              top_delta="0"
-              width="100">
-              <button.commit_callback
-                  function="SocialSharing.Cancel" />
-            </button>
-        </layout_panel>
-     </layout_stack>
-    </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_social_status.xml b/indra/newview/skins/default/xui/en/panel_social_status.xml
deleted file mode 100644
index 54cfa3f524..0000000000
--- a/indra/newview/skins/default/xui/en/panel_social_status.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-    <panel
-	 height="400"
-	 width="304"
-	 layout="topleft"
-     name="panel_social_status">
-     <layout_stack
-      layout="topleft"
-      border_size="0"
-      height="392"
-      follows="all"
-      orientation="vertical"
-      name="stack_status"
-      top="8">
-      <layout_panel
-       name="status_detail_panel"
-       height="367">
-       <text
-        length="1"
-        follows="top|left|right"
-        font="SansSerif"
-        height="16"
-        left="9"
-        name="status_caption_label"
-        top="13"
-        type="string">
-        What's on your mind?
-       </text>
-       <text_editor
-        follows="left|top"
-        height="150"
-        width="250"
-        left="9"
-        length="1"
-        max_length="700"
-        name="status_message"
-        type="string"
-        word_wrap="true">
-       </text_editor>
-      </layout_panel>
-      <layout_panel
-       name="status_button_panel"
-       height="25">
-       <button
-        follows="left|top"
-        top="0"
-        left="9"
-        height="23"
-        label="Post"
-        name="post_status_btn"
-        width="100">
-        <button.commit_callback
-          function="SocialSharing.SendStatus" />
-       </button>
-       <button
-        follows="left|top"
-        height="23"
-        label="Cancel"
-        name="cancel_status_btn"
-        left_pad="15"
-        top_delta="0"
-        width="100">
-        <button.commit_callback
-          function="SocialSharing.Cancel" />
-       </button>
-      </layout_panel>
-     </layout_stack>
-    </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b24cca588e..3806e1287c 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3877,6 +3877,8 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Conversations_Label">Conversations</string>
   <string name="Command_Compass_Label">Compass</string>
   <string name="Command_Destinations_Label">Destinations</string>
+  <string name="Command_Facebook_Label">Facebook</string>
+  <string name="Command_Flickr_Label">Flickr</string>
   <string name="Command_Gestures_Label">Gestures</string>
   <string name="Command_HowTo_Label">How to</string>
   <string name="Command_Inventory_Label">Inventory</string>
@@ -3892,10 +3894,8 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Profile_Label">Profile</string>
   <string name="Command_Search_Label">Search</string>
   <string name="Command_Snapshot_Label">Snapshot</string>
-  <string name="Command_Social_Label">Facebook</string>
-  <string name="Command_Flickr_Label">Flickr</string>
-  <string name="Command_Twitter_Label">Twitter</string>
   <string name="Command_Speak_Label">Speak</string>
+  <string name="Command_Twitter_Label">Twitter</string>
   <string name="Command_View_Label">Camera controls</string>
   <string name="Command_Voice_Label">Voice settings</string>
 
@@ -3907,6 +3907,8 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Conversations_Tooltip">Converse with everyone</string>
   <string name="Command_Compass_Tooltip">Compass</string>
   <string name="Command_Destinations_Tooltip">Destinations of interest</string>
+  <string name="Command_Facebook_Tooltip">Post to Facebook</string>
+  <string name="Command_Flickr_Tooltip">Upload to Flickr</string>
   <string name="Command_Gestures_Tooltip">Gestures for your avatar</string>
   <string name="Command_HowTo_Tooltip">How to do common tasks</string>
   <string name="Command_Inventory_Tooltip">View and use your belongings</string>
@@ -3922,10 +3924,8 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Profile_Tooltip">Edit or view your profile</string>
   <string name="Command_Search_Tooltip">Find places, events, people</string>
   <string name="Command_Snapshot_Tooltip">Take a picture</string>
-  <string name="Command_Social_Tooltip">Post to Facebook</string>
-  <string name="Command_Flickr_Tooltip">Upload to Flickr</string>
-  <string name="Command_Twitter_Tooltip">Twitter</string>
   <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string>
+  <string name="Command_Twitter_Tooltip">Twitter</string>
   <string name="Command_View_Tooltip">Changing camera angle</string>
   <string name="Command_Voice_Tooltip">Volume controls for calls and people near you in world</string>
 
-- 
cgit v1.2.3


From 26a6668fb23ce289b67154ba3e3ac35f25a54978 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 11 Dec 2013 21:46:17 -0800
Subject: ACME-1233 : Set the quality for jpeg images send to Facebook
 correctly

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

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

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 19f9f2fb74..2d46665bae 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
@@ -39,6 +39,10 @@
                label="1024x768"
                name="1024x768"
                value="[i1024,i768]" />
+              <combo_box.item
+               label="1200x630"
+               name="1200x630"
+               value="[i1200,i630]" />
             </combo_box>
             <text
              follows="left|top"
-- 
cgit v1.2.3


From e88c9909b627502db55aa85ba8b2947039818e60 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Wed, 18 Dec 2013 22:24:21 +0000
Subject: Added highlighting to SLShare tabs for ACME-1177

---
 indra/newview/skins/default/xui/en/floater_facebook.xml | 3 ++-
 indra/newview/skins/default/xui/en/floater_flickr.xml   | 3 ++-
 indra/newview/skins/default/xui/en/floater_twitter.xml  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_facebook.xml b/indra/newview/skins/default/xui/en/floater_facebook.xml
index 820e105e53..c1ff8571e9 100644
--- a/indra/newview/skins/default/xui/en/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/en/floater_facebook.xml
@@ -28,7 +28,8 @@
      tab_position="top"
      top="7"
      height="437"
-     halign="center">
+     halign="center"
+     use_highlighting_on_hover="true">
      <panel
        filename="panel_facebook_status.xml"
        class="llfacebookstatuspanel"
diff --git a/indra/newview/skins/default/xui/en/floater_flickr.xml b/indra/newview/skins/default/xui/en/floater_flickr.xml
index 57014f8427..1a9ffd0489 100644
--- a/indra/newview/skins/default/xui/en/floater_flickr.xml
+++ b/indra/newview/skins/default/xui/en/floater_flickr.xml
@@ -28,7 +28,8 @@
      tab_position="top"
      top="7"
      height="577"
-     halign="center">
+     halign="center"
+     use_highlighting_on_hover="true">
      <panel
        filename="panel_flickr_photo.xml"
        class="llflickrphotopanel"
diff --git a/indra/newview/skins/default/xui/en/floater_twitter.xml b/indra/newview/skins/default/xui/en/floater_twitter.xml
index 751914141c..aa5bfce2e9 100644
--- a/indra/newview/skins/default/xui/en/floater_twitter.xml
+++ b/indra/newview/skins/default/xui/en/floater_twitter.xml
@@ -28,7 +28,8 @@
      tab_position="top"
      top="7"
      height="457"
-     halign="center">
+     halign="center"
+     use_highlighting_on_hover="true">
      <panel
        filename="panel_twitter_photo.xml"
        class="lltwitterphotopanel"
-- 
cgit v1.2.3


From 6578144b7eda1dae885e5cc172751203b1d16c2d Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 18 Dec 2013 15:55:13 -0800
Subject: ACME-1236 : WIP : Added Gray Scale as an experimental filter in
 Flickr. Lots of ugly hacks for now

---
 .../skins/default/xui/en/panel_flickr_photo.xml    | 31 +++++++++++++---------
 1 file changed, 18 insertions(+), 13 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
index b3af271f34..28e3557e15 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -40,19 +40,24 @@
                name="1024x768"
                value="[i1024,i768]" />
             </combo_box>
-            <text
-             follows="left|top"
-             font="SansSerifSmall"
-             height="14"
-             left="208"
-             length="1"
-             halign="right"
-             name="file_size_label"
-             top="9"
-             type="string"
-             width="50">
-              [SIZE] KB
-            </text>
+            <combo_box
+               control_name="SocialPhotoFilters"
+               follows="right|top"
+               name="filters_combobox"
+               tool_tip="Image filters"
+               top="6"
+               left="165"
+               height="21"
+               width="135">
+                <combo_box.item
+                 label="No Filter"
+                 name="NoFilter"
+                 value="NoFilter" />
+                <combo_box.item
+                 label="Gray Scale"
+                 name="GrayScale"
+                 value="GrayScale" />
+            </combo_box>
             <panel
                 height="150"
                 width="250"
-- 
cgit v1.2.3


From 5342d0c570ef6c654b63a403d9aa7b51ef65f249 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 13 Jan 2014 14:36:42 -0800
Subject: ACME-1256 : Rename and cleanup in the default filters

---
 indra/newview/skins/default/xui/en/panel_flickr_photo.xml | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
index 28e3557e15..47ddecdf38 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -53,10 +53,6 @@
                  label="No Filter"
                  name="NoFilter"
                  value="NoFilter" />
-                <combo_box.item
-                 label="Gray Scale"
-                 name="GrayScale"
-                 value="GrayScale" />
             </combo_box>
             <panel
                 height="150"
-- 
cgit v1.2.3


From 91f401fa2de8c78da7c83561501a1be993588867 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 16 Jan 2014 17:52:14 -0800
Subject: ACME-1237 : Use translation service for filter names so they can be
 localized and as also look proper in English. General filter manager cleanup

---
 indra/newview/skins/default/xui/en/strings.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d226a72d7b..92913f678d 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -168,6 +168,18 @@ Please try logging in again in a minute.</string>
   <string name="SocialTwitterErrorPosting">Problem posting to Twitter</string>
   <string name="SocialTwitterErrorDisconnecting">Problem disconnecting from Twitter</string>
     
+	<!-- SLShare: User Friendly Filter Names Translation -->
+    <string name="BlackAndWhite">Black &amp; White</string>
+    <string name="Colors1970">1970&apos;s Colors</string>
+    <string name="Heatwave">Heat Wave</string>
+    <string name="Intense">Intense</string>
+    <string name="JulesVerne">Jules Verne</string>
+    <string name="Newspaper">Newspaper</string>
+    <string name="Overcast">Overcast</string>
+    <string name="Sepia">Sepia</string>
+    <string name="Spotlight">Spotlight</string>
+    <string name="Video">Video</string>
+    
 	<!-- Tooltip -->
 	<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
 	<string name="TooltipNoName">(no name)</string> <!-- No name on an object -->
-- 
cgit v1.2.3


From f7a90c680a007775efe0f8556c6712a08e489aab Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 28 Jan 2014 19:00:46 -0800
Subject: ACME-1275 : Implemented filters to the Twitter and Facebook panels

---
 .../skins/default/xui/en/panel_facebook_photo.xml  | 27 +++++++++++-----------
 .../skins/default/xui/en/panel_twitter_photo.xml   | 27 +++++++++++-----------
 2 files changed, 28 insertions(+), 26 deletions(-)

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

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 2d46665bae..0a90d000bd 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
@@ -44,19 +44,20 @@
                name="1200x630"
                value="[i1200,i630]" />
             </combo_box>
-            <text
-             follows="left|top"
-             font="SansSerifSmall"
-             height="14"
-             left="208"
-             length="1"
-             halign="right"
-             name="file_size_label"
-             top="9"
-             type="string"
-             width="50">
-              [SIZE] KB
-            </text>
+            <combo_box
+                control_name="SocialPhotoFilters"
+                follows="right|top"
+                name="filters_combobox"
+                tool_tip="Image filters"
+                top="6"
+                left="165"
+                height="21"
+                width="135">
+                <combo_box.item
+                label="No Filter"
+                name="NoFilter"
+                value="NoFilter" />
+            </combo_box>
             <panel
                 height="150"
                 width="250"
diff --git a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
index 14268c1bcf..e044dbdf55 100644
--- a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
@@ -96,19 +96,20 @@
                name="1024x768"
                value="[i1024,i768]" />
             </combo_box>
-            <text
-             follows="left|top"
-             font="SansSerifSmall"
-             height="14"
-             left="208"
-             length="1"
-             halign="right"
-             name="file_size_label"
-             top="9"
-             type="string"
-             width="50">
-              [SIZE] KB
-            </text>
+              <combo_box
+                  control_name="SocialPhotoFilters"
+                  follows="right|top"
+                  name="filters_combobox"
+                  tool_tip="Image filters"
+                  top="6"
+                  left="165"
+                  height="21"
+                  width="135">
+                  <combo_box.item
+                  label="No Filter"
+                  name="NoFilter"
+                  value="NoFilter" />
+              </combo_box>
             <panel
                 height="150"
                 width="250"
-- 
cgit v1.2.3


From e42a372592a9b6c996d989a7e38c62761f73908a Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 29 Jan 2014 22:41:27 -0800
Subject: ACME : Add filters to Snapshot Advanced panel for demo

---
 indra/newview/skins/default/xui/en/floater_snapshot.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 019ddad33c..705225b839 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -381,5 +381,19 @@
          top_pad="8"
          width="180"
          name="auto_snapshot_check" />
+        <combo_box
+            control_name="PhotoFilters"
+            follows="left|right|top"
+            name="filters_combobox"
+            tool_tip="Image filters"
+            top_pad="8"
+            left="30"
+            height="21"
+            width="135">
+            <combo_box.item
+            label="No Filter"
+            name="NoFilter"
+            value="NoFilter" />
+        </combo_box>
     </panel>
 </floater>
-- 
cgit v1.2.3


From e970fa7f1ce9190b8a26e72bebbcceed04fb7494 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 30 Jan 2014 18:53:05 -0800
Subject: ACME-1293 : Use notification to signal from the snapshot panel to its
 container rather than grabbing global instances, use unique control_name for
 widgets, fix Post button visibility on Twitter

---
 indra/newview/skins/default/xui/en/panel_facebook_photo.xml | 4 ++--
 indra/newview/skins/default/xui/en/panel_flickr_photo.xml   | 4 ++--
 indra/newview/skins/default/xui/en/panel_twitter_photo.xml  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

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

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 0a90d000bd..0cde43a20c 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
@@ -15,7 +15,7 @@
          name="snapshot_panel"
          height="367">
             <combo_box
-             control_name="SocialPhotoResolution"
+             control_name="FacebookPhotoResolution"
              follows="left|top"
              top="6"
              left="9"
@@ -45,7 +45,7 @@
                value="[i1200,i630]" />
             </combo_box>
             <combo_box
-                control_name="SocialPhotoFilters"
+                control_name="FacebookPhotoFilters"
                 follows="right|top"
                 name="filters_combobox"
                 tool_tip="Image filters"
diff --git a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
index 47ddecdf38..01116c6c4c 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -15,7 +15,7 @@
          name="snapshot_panel"
          height="507">
             <combo_box
-             control_name="SocialPhotoResolution"
+             control_name="FlickrPhotoResolution"
              follows="left|top"
              top="6"
              left="9"
@@ -41,7 +41,7 @@
                value="[i1024,i768]" />
             </combo_box>
             <combo_box
-               control_name="SocialPhotoFilters"
+               control_name="FlickrPhotoFilters"
                follows="right|top"
                name="filters_combobox"
                tool_tip="Image filters"
diff --git a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
index e044dbdf55..bcec09ebab 100644
--- a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
@@ -71,7 +71,7 @@
            name="snapshot_panel"
            height="227">
             <combo_box
-             control_name="SocialPhotoResolution"
+             control_name="TwitterPhotoResolution"
              follows="left|top"
              top="6"
              left="9"
@@ -97,7 +97,7 @@
                value="[i1024,i768]" />
             </combo_box>
               <combo_box
-                  control_name="SocialPhotoFilters"
+                  control_name="TwitterPhotoFilters"
                   follows="right|top"
                   name="filters_combobox"
                   tool_tip="Image filters"
-- 
cgit v1.2.3


From 009449126a350f60dd90da9879247ceacb99936f Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 31 Jan 2014 12:08:23 -0800
Subject: ACME-1296 : Remove Filters from Advanced Snapshot panel

---
 indra/newview/skins/default/xui/en/floater_snapshot.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 705225b839..5e3c7d4e3d 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -381,6 +381,19 @@
          top_pad="8"
          width="180"
          name="auto_snapshot_check" />
+        <!-- If we ever want to add filters to the snapshot panel...
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="13"
+         layout="topleft"
+         left="10"
+         name="layer_type_label"
+         top_pad="10"
+         width="50">
+            Filter:
+        </text>
         <combo_box
             control_name="PhotoFilters"
             follows="left|right|top"
@@ -395,5 +408,6 @@
             name="NoFilter"
             value="NoFilter" />
         </combo_box>
+         -->
     </panel>
 </floater>
-- 
cgit v1.2.3


From a6123336e20ad8e6b597437e808a22d9a9a46c6b Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Thu, 6 Feb 2014 00:42:11 +0000
Subject: Made Flickr rating default to Safe for ACME-1304

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
index 01116c6c4c..4516c01670 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -183,21 +183,20 @@ Use "" for multi-word tags
              follows="left|top"
              top_pad="16"
              left="9"
-             label="Choose Flickr rating (required)..."
              name="rating_combobox"
              tool_tip="Flickr content rating"
              height="21"
              width="250">
               <combo_box.item
-               label="Safe content rating"
+               label="Safe Flickr rating"
                name="SafeRating"
                value="1" />
               <combo_box.item
-               label="Moderate content rating"
+               label="Moderate Flickr rating"
                name="ModerateRating"
                value="2" />
               <combo_box.item
-               label="Restricted content rating"
+               label="Restricted Flickr rating"
                name="RestrictedRating"
                value="3" />
             </combo_box>
-- 
cgit v1.2.3


From a5366f06edf5aa1b75328e26011989eba7c601ca Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 13 Feb 2014 15:15:05 -0800
Subject: ACME-1277 : Final set of filters, added a SnapshotFiltersEnabled
 debug setting

---
 indra/newview/skins/default/xui/en/floater_snapshot.xml |  4 +---
 indra/newview/skins/default/xui/en/strings.xml          | 13 +++++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 5e3c7d4e3d..771035b40d 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -381,7 +381,6 @@
          top_pad="8"
          width="180"
          name="auto_snapshot_check" />
-        <!-- If we ever want to add filters to the snapshot panel...
         <text
          type="string"
          length="1"
@@ -389,7 +388,7 @@
          height="13"
          layout="topleft"
          left="10"
-         name="layer_type_label"
+         name="filter_list_label"
          top_pad="10"
          width="50">
             Filter:
@@ -408,6 +407,5 @@
             name="NoFilter"
             value="NoFilter" />
         </combo_box>
-         -->
     </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 92913f678d..51576f71a8 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -171,16 +171,17 @@ Please try logging in again in a minute.</string>
 	<!-- SLShare: User Friendly Filter Names Translation -->
     <string name="BlackAndWhite">Black &amp; White</string>
     <string name="Colors1970">1970&apos;s Colors</string>
-    <string name="Heatwave">Heat Wave</string>
     <string name="Intense">Intense</string>
-    <string name="JulesVerne">Jules Verne</string>
-    <string name="Newspaper">Newspaper</string>
-    <string name="Overcast">Overcast</string>
+    <string name="Newspaper">Newsprint</string>
     <string name="Sepia">Sepia</string>
     <string name="Spotlight">Spotlight</string>
     <string name="Video">Video</string>
-    
-	<!-- Tooltip -->
+    <string name="Autocontrast">Autocontrast</string>
+    <string name="LensFlare">Lens Flare</string>
+    <string name="Miniature">Miniature</string>
+    <string name="Toycamera">Toy Camera</string>
+	
+    <!-- Tooltip -->
 	<string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
 	<string name="TooltipNoName">(no name)</string> <!-- No name on an object -->
 	<string name="TooltipOwner">Owner:</string> <!-- Owner name follows -->
-- 
cgit v1.2.3


From ac9cf045ecc14f8c650773f3fff7bc338fa468d0 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Fri, 21 Feb 2014 02:06:03 +0000
Subject: Added Friends tab to Facebook floater for ACME-1325

---
 .../skins/default/xui/en/floater_facebook.xml      | 10 +++++--
 .../default/xui/en/panel_facebook_friends.xml      | 35 ++++++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_facebook_friends.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_facebook.xml b/indra/newview/skins/default/xui/en/floater_facebook.xml
index c1ff8571e9..544c443c76 100644
--- a/indra/newview/skins/default/xui/en/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/en/floater_facebook.xml
@@ -48,13 +48,19 @@
        follows="all"
        label="CHECK IN"
        name="panel_facebook_place"/>
+     <panel
+       filename="panel_facebook_friends.xml"
+       class="llfacebookfriendspanel"
+       follows="all"
+       label="FRIENDS"
+       name="panel_facebook_friends"/>
      <panel
        filename="panel_facebook_account.xml"
        class="llfacebookaccountpanel"
        follows="all"
        label="ACCOUNT"
-       name="panel_facebook_account"/>     
-    </tab_container>
+       name="panel_facebook_account"/>
+   </tab_container>
     <panel
      name="connection_status_panel"
      follows="left|bottom|right"
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
new file mode 100644
index 0000000000..d772dde0c5
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
@@ -0,0 +1,35 @@
+<panel
+	 height="400"
+	 width="304"
+	 layout="topleft"
+   name="panel_facebook_friends">
+  <accordion
+ background_visible="true"
+ bg_alpha_color="DkGray2"
+ bg_opaque_color="DkGray2"
+   follows="all"
+   height="408"
+   layout="topleft"
+   left="3"
+   name="friends_accordion"
+   right="-2"
+   top_pad="2">
+    <accordion_tab
+     layout="topleft"
+     height="173"
+     name="tab_suggested_friends"
+     title="People you may want to friend">
+      <avatar_list
+       ignore_online_status="true"
+       allow_select="true"
+       follows="all"
+       height="173"
+       layout="topleft"
+       left="0"
+       name="suggested_friends"
+       show_permissions_granted="true"
+       top="0"
+       width="307" />
+    </accordion_tab>
+  </accordion>
+</panel>
-- 
cgit v1.2.3


From d220657d8525ccfa246e0f49904e18cc36458b28 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 25 Feb 2014 21:54:09 -0800
Subject: ACME-1327 : WIP : Added big preview to the Flickr photo panel, uses
 the thumbnail for the moment

---
 .../skins/default/xui/en/floater_big_preview.xml   | 25 ++++++++++++++++++++++
 .../skins/default/xui/en/panel_flickr_photo.xml    | 17 +++++++++++++--
 2 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_big_preview.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_big_preview.xml b/indra/newview/skins/default/xui/en/floater_big_preview.xml
new file mode 100644
index 0000000000..23698ccc40
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_big_preview.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<floater
+  positioning="cascading"
+  can_close="true"
+  can_resize="false"
+  can_minimize="false"
+  help_topic="floater_big_preview"
+  layout="topleft"
+  name="floater_big_preview"
+  save_rect="true"
+  single_instance="true"
+  reuse_instance="true"
+  title="PREVIEW"
+  height="465"
+  width="770">
+  <panel
+   height="450"
+   width="750"
+   visible="true"
+   name="big_preview_placeholder"
+   top="5"
+   follows="all"
+   left="10">
+  </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
index 4516c01670..350c385cc3 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -82,7 +82,7 @@
                 text_color="EmphasisColor"
                 height="14"
                 top_pad="-19"
-                left_pad="-20"
+                left_pad="-30"
                 length="1"
                 halign="center"
                 name="working_lbl"
@@ -92,6 +92,19 @@
                 width="150">
                 Refreshing...
             </text>
+            <button
+                follows="right|top"
+                height="23"
+                label="Big Preview"
+                left="200"
+                top_pad="-19"
+                name="big_preview_btn"
+                tool_tip="Click to open big preview"
+                visible="true"
+                width="100" >
+                <button.commit_callback
+                function="SocialSharing.BigPreview" />
+            </button>
             <text
              length="1"
              follows="top|left|right"
@@ -99,7 +112,7 @@
              height="16"
              left="9"
              name="title_label"
-             top_pad="20"
+             top_pad="15"
              type="string">
               Title:
             </text>
-- 
cgit v1.2.3


From 6dfcd7fc2bd0f502673c43f1a54cda2a8d74e391 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 25 Feb 2014 23:01:52 -0800
Subject: ACME-1327 : WIP : Added computation of the big preview, allow big
 preview to be resizable

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_big_preview.xml b/indra/newview/skins/default/xui/en/floater_big_preview.xml
index 23698ccc40..c0bdd3d9bd 100644
--- a/indra/newview/skins/default/xui/en/floater_big_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_big_preview.xml
@@ -2,7 +2,7 @@
 <floater
   positioning="cascading"
   can_close="true"
-  can_resize="false"
+  can_resize="true"
   can_minimize="false"
   help_topic="floater_big_preview"
   layout="topleft"
-- 
cgit v1.2.3


From ed38a0aede09f42c4fe7eb4dd53ecd6490d12ca0 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 26 Feb 2014 17:22:16 -0800
Subject: ACME-1327 : WIP : Make rescale of preview isotropic, make preview
 button a toggle

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
index 350c385cc3..8d8ef45c0d 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -95,11 +95,12 @@
             <button
                 follows="right|top"
                 height="23"
-                label="Big Preview"
+                label="Preview"
                 left="200"
                 top_pad="-19"
                 name="big_preview_btn"
-                tool_tip="Click to open big preview"
+                tool_tip="Click to toggle preview"
+                is_toggle="true"
                 visible="true"
                 width="100" >
                 <button.commit_callback
-- 
cgit v1.2.3


From 279e9b0743dfd86f9b40f693349aae9fc1268d35 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 27 Feb 2014 13:04:23 -0800
Subject: ACME-1327 : Implemented preview in all SL Share panels, switch
 ownership of preview to focused SL Share photo panel

---
 .../skins/default/xui/en/panel_facebook_photo.xml        | 16 +++++++++++++++-
 .../newview/skins/default/xui/en/panel_twitter_photo.xml | 16 +++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

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

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 0cde43a20c..1d826fdbe1 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
@@ -86,7 +86,7 @@
                 text_color="EmphasisColor"
                 height="14"
                 top_pad="-19"
-                left_pad="-20"
+                left_pad="-30"
                 length="1"
                 halign="center"
                 name="working_lbl"
@@ -96,6 +96,20 @@
                 width="150">
                 Refreshing...
             </text>
+            <button
+                follows="right|top"
+                height="23"
+                label="Preview"
+                left="200"
+                top_pad="-19"
+                name="big_preview_btn"
+                tool_tip="Click to toggle preview"
+                is_toggle="true"
+                visible="true"
+                width="100" >
+                <button.commit_callback
+                function="SocialSharing.BigPreview" />
+            </button>
             <text
              length="1"
              follows="top|left|right"
diff --git a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
index bcec09ebab..c2be56da21 100644
--- a/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
@@ -138,7 +138,7 @@
                 text_color="EmphasisColor"
                 height="14"
                 top_pad="-19"
-                left_pad="-20"
+                left_pad="-30"
                 length="1"
                 halign="center"
                 name="working_lbl"
@@ -148,6 +148,20 @@
                 width="150">
                 Refreshing...
             </text>
+              <button
+                  follows="right|top"
+                  height="23"
+                  label="Preview"
+                  left="200"
+                  top_pad="-19"
+                  name="big_preview_btn"
+                  tool_tip="Click to toggle preview"
+                  is_toggle="true"
+                  visible="true"
+                  width="100" >
+                  <button.commit_callback
+                  function="SocialSharing.BigPreview" />
+              </button>
         </layout_panel>
         <layout_panel
           name="photo_button_panel"
-- 
cgit v1.2.3


From ceec7b7efe8f55f3262e07d9a6284dc5b4ab797a Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 27 Feb 2014 16:03:35 -0800
Subject: ACME-1333 : Allow Facebook panel to be resized, fixed ensuing follow
 positioning issues in all subpanels

---
 indra/newview/skins/default/xui/en/floater_facebook.xml       | 7 +++++--
 indra/newview/skins/default/xui/en/panel_facebook_account.xml | 2 ++
 indra/newview/skins/default/xui/en/panel_facebook_friends.xml | 1 +
 indra/newview/skins/default/xui/en/panel_facebook_photo.xml   | 9 +++++----
 indra/newview/skins/default/xui/en/panel_facebook_place.xml   | 7 ++++---
 indra/newview/skins/default/xui/en/panel_facebook_status.xml  | 7 ++++---
 6 files changed, 21 insertions(+), 12 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_facebook.xml b/indra/newview/skins/default/xui/en/floater_facebook.xml
index 544c443c76..4535b9084e 100644
--- a/indra/newview/skins/default/xui/en/floater_facebook.xml
+++ b/indra/newview/skins/default/xui/en/floater_facebook.xml
@@ -2,7 +2,7 @@
 <floater
   positioning="cascading"
   can_close="true"
-  can_resize="false"
+  can_resize="true"
   help_topic="floater_facebook"
   layout="topleft"
   name="floater_facebook"
@@ -10,6 +10,8 @@
   single_instance="true"
   reuse_instance="true"
   title="POST TO FACEBOOK"
+  min_height="501"
+  min_width="304"
   height="482"
   width="304">
   <panel
@@ -28,6 +30,7 @@
      tab_position="top"
      top="7"
      height="437"
+     follows="all"
      halign="center"
      use_highlighting_on_hover="true">
      <panel
@@ -81,7 +84,7 @@
       Error
      </text>
      <loading_indicator
-      follows="left|bottom|right"
+      follows="left|bottom"
       height="24"
       width="24"
       name="connection_loading_indicator"
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_account.xml b/indra/newview/skins/default/xui/en/panel_facebook_account.xml
index f091d2e9b9..abe0a694a4 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_account.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_account.xml
@@ -2,6 +2,7 @@
 	 height="400"
 	 width="304"
 	 layout="topleft"
+    follows="all"
    name="panel_facebook_account">
   <string
       name="facebook_connected"
@@ -34,6 +35,7 @@
    type="string"/>
   <panel
     layout="topleft"
+    follows="left|top"
     name="panel_buttons"
     height="345"
     left="9">
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
index d772dde0c5..07cbd06afa 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
@@ -2,6 +2,7 @@
 	 height="400"
 	 width="304"
 	 layout="topleft"
+    follows="all"
    name="panel_facebook_friends">
   <accordion
  background_visible="true"
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 1d826fdbe1..81f7a7de22 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
@@ -2,6 +2,7 @@
       height="400"
       width="304"
       layout="topleft"
+      follows="all"
       name="panel_facebook_photo">
       <layout_stack
 	   layout="topleft"
@@ -64,7 +65,7 @@
                 visible="true"
                 name="thumbnail_placeholder"
                 top="33"
-                follows="left|top"
+                follows="left|top|right"
                 left="9">
             </panel>
             <button
@@ -122,7 +123,7 @@
               Comment (optional):
             </text>
             <text_editor
-             follows="left|top"
+             follows="left|top|right"
              height="87"
              width="250"
              left="9"
@@ -145,7 +146,7 @@
           name="photo_button_panel"
           height="25">
           <button
-           follows="left|top"
+           follows="left|bottom"
            top="0"
            left="9"
            height="23"
@@ -156,7 +157,7 @@
              function="SocialSharing.SendPhoto" />
           </button>
           <button
-               follows="left|top"
+               follows="left|bottom"
                height="23"
                label="Cancel"
                name="cancel_photo_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_place.xml b/indra/newview/skins/default/xui/en/panel_facebook_place.xml
index 1eea8f317b..84c87df523 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_place.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_place.xml
@@ -2,6 +2,7 @@
       height="400"
       width="304"
 	  layout="topleft"
+      follows="all"
       name="panel_facebook_place">
       <layout_stack
 	    layout="topleft"
@@ -26,7 +27,7 @@
             Say something about where you are:
           </text>
           <text_editor
-            follows="top|left"
+            follows="top|left|right"
             height="150"
             width="250"
             left="9"
@@ -106,7 +107,7 @@
             name="place_button_panel"
             height="25">
             <button
-              follows="left|top"
+              follows="left|bottom"
               top="0"
               left="9"
               height="23"
@@ -117,7 +118,7 @@
                  function="SocialSharing.SendCheckin" />
             </button>
             <button
-              follows="left|top"
+              follows="left|bottom"
               height="23"
               label="Cancel"
               name="cancel_place_btn"
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_status.xml b/indra/newview/skins/default/xui/en/panel_facebook_status.xml
index 50e15c2e80..480abec558 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_status.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_status.xml
@@ -1,6 +1,7 @@
     <panel
 	 height="400"
 	 width="304"
+     follows="all"
 	 layout="topleft"
      name="panel_facebook_status">
      <layout_stack
@@ -26,7 +27,7 @@
         What's on your mind?
        </text>
        <text_editor
-        follows="left|top"
+        follows="left|top|right"
         height="150"
         width="250"
         left="9"
@@ -41,7 +42,7 @@
        name="status_button_panel"
        height="25">
        <button
-        follows="left|top"
+        follows="left|bottom"
         top="0"
         left="9"
         height="23"
@@ -52,7 +53,7 @@
           function="SocialSharing.SendStatus" />
        </button>
        <button
-        follows="left|top"
+        follows="left|bottom"
         height="23"
         label="Cancel"
         name="cancel_status_btn"
-- 
cgit v1.2.3


From df26597c0d2ddfcc259dd1b8e838164cbd9ff02a Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Fri, 28 Feb 2014 01:49:58 +0000
Subject: Added FB+SL friends list to Friends tab in Facebook floater for
 ACME-1334

---
 .../skins/default/xui/en/panel_facebook_friends.xml   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
index 07cbd06afa..9d5c86c79d 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
@@ -15,11 +15,28 @@
    name="friends_accordion"
    right="-2"
    top_pad="2">
+    <accordion_tab
+     layout="topleft"
+     height="173"
+     name="tab_second_life_friends"
+     title="SL friends">
+      <avatar_list
+       ignore_online_status="true"
+       allow_select="true"
+       follows="all"
+       height="173"
+       layout="topleft"
+       left="0"
+       name="second_life_friends"
+       show_permissions_granted="true"
+       top="0"
+       width="307" />
+    </accordion_tab>
     <accordion_tab
      layout="topleft"
      height="173"
      name="tab_suggested_friends"
-     title="People you may want to friend">
+     title="Add these people as SL friends">
       <avatar_list
        ignore_online_status="true"
        allow_select="true"
-- 
cgit v1.2.3


From 0fb59172f7c8c2ad2d3f4f77e14108fc16accdc7 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 28 Feb 2014 16:10:27 -0800
Subject: ACME-1335, ACME-1336 : Add info text to the Friends tab in Facebook
 when no friends are visible

---
 .../skins/default/xui/en/panel_facebook_friends.xml   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
index 9d5c86c79d..23820d209a 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
@@ -4,6 +4,12 @@
 	 layout="topleft"
     follows="all"
    name="panel_facebook_friends">
+  <string
+   name="facebook_friends_empty"
+   value="You do not have any Facebook friend who are also Second Life resident. You can go to the Status panel and let them know you're in Second Life!" />
+  <string
+   name="facebook_friends_no_connected"
+   value="You're currently not connected to Facebook. Please go to the Account tab to connect and enable this feature." />
   <accordion
  background_visible="true"
  bg_alpha_color="DkGray2"
@@ -50,4 +56,17 @@
        width="307" />
     </accordion_tab>
   </accordion>
+    <text
+        layout="topleft"
+        word_wrap="true"
+        height="64"
+        width="290"
+        follows="top|left|right"
+        font="SansSerif"
+        left="9"
+        name="facebook_friends_status"
+        top="21"
+        type="string">
+        Not connected to Facebook.
+    </text>
 </panel>
-- 
cgit v1.2.3


From 83c3e37a2693d60c355baeac10eccdfbe30f0771 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 3 Mar 2014 10:42:26 -0800
Subject: ACME-1336 : Fix message when FB friends list is empty

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
index 23820d209a..9d21a3a293 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
@@ -6,7 +6,7 @@
    name="panel_facebook_friends">
   <string
    name="facebook_friends_empty"
-   value="You do not have any Facebook friend who are also Second Life resident. You can go to the Status panel and let them know you're in Second Life!" />
+   value="You currently do not have any Facebook friends who are also Second Life residents. Ask your Facebook friends to join Second Life today!" />
   <string
    name="facebook_friends_no_connected"
    value="You're currently not connected to Facebook. Please go to the Account tab to connect and enable this feature." />
-- 
cgit v1.2.3


From c64e878333ed86c83b0d82c10cc61d4d8d3e8af2 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Thu, 6 Mar 2014 22:18:49 +0000
Subject: Updated hard links for ACME-1306

---
 indra/newview/skins/default/xui/en/panel_facebook_account.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_flickr_account.xml   | 2 +-
 indra/newview/skins/default/xui/en/panel_twitter_account.xml  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_facebook_account.xml b/indra/newview/skins/default/xui/en/panel_facebook_account.xml
index abe0a694a4..122cbfb717 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_account.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_account.xml
@@ -71,7 +71,7 @@
       name="account_learn_more_label"
       top_pad="20"
       type="string">
-      [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share/ta-p/2149711 Learn about posting to Facebook]
+      [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Learn about posting to Facebook]
     </text>
   </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_flickr_account.xml b/indra/newview/skins/default/xui/en/panel_flickr_account.xml
index 3a38852049..506d2e2f74 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_account.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_account.xml
@@ -69,7 +69,7 @@
       name="account_learn_more_label"
       top_pad="20"
       type="string">
-      [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share/ta-p/2149711 Learn about posting to Flickr]
+      [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Flickr/ta-p/2435609 Learn about posting to Flickr]
     </text>
   </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_twitter_account.xml b/indra/newview/skins/default/xui/en/panel_twitter_account.xml
index 4a413bd711..ee4f6396e1 100644
--- a/indra/newview/skins/default/xui/en/panel_twitter_account.xml
+++ b/indra/newview/skins/default/xui/en/panel_twitter_account.xml
@@ -69,7 +69,7 @@
       name="account_learn_more_label"
       top_pad="20"
       type="string">
-      [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share/ta-p/2149711 Learn about posting to Twitter]
+      [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Twitter/ta-p/2435453 Learn about posting to Twitter]
     </text>
   </panel>
 </panel>
-- 
cgit v1.2.3


From 619aa8e65c2eb81c62accbc87fcf2c85534180ae Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 17 Mar 2014 18:08:21 -0700
Subject: ACME-1376 : Suppress location checkbox in Facebook Photo panel

---
 indra/newview/skins/default/xui/en/panel_facebook_photo.xml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

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

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 81f7a7de22..b5b6dee004 100644
--- a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
@@ -123,7 +123,7 @@
               Comment (optional):
             </text>
             <text_editor
-             follows="left|top|right"
+             follows="left|top|right|bottom"
              height="87"
              width="250"
              left="9"
@@ -133,14 +133,6 @@
              type="string"
              word_wrap="true">
             </text_editor>
-            <check_box
-             follows="left|top"
-             initial_value="true"
-             label="Include location in posting"
-             name="add_location_cb"
-              left="9"
-              height="16"
-             top_pad="8"/>
         </layout_panel>
         <layout_panel
           name="photo_button_panel"
-- 
cgit v1.2.3