merge changes for 3.7.10-release

21 files changed, 1102 insertions, 76 deletions

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index d4df1ee71c..ec733c1e8b 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,9 +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_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/textures/toolbar_icons/flickr.png b/indra/newview/skins/default/textures/toolbar_icons/flickr.png
new file mode 100644
index 0000000000..7fce9f0df2
--- /dev/null
+++ b/indra/newview/skins/default/textures/toolbar_icons/flickr.png
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
--- /dev/null
+++ b/indra/newview/skins/default/textures/toolbar_icons/twitter.png
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..c0bdd3d9bd
--- /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="true"
+  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/floater_facebook.xml b/indra/newview/skins/default/xui/en/floater_facebook.xml
new file mode 100644
index 0000000000..4535b9084e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_facebook.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<floater
+  positioning="cascading"
+  can_close="true"
+  can_resize="true"
+  help_topic="floater_facebook"
+  layout="topleft"
+  name="floater_facebook"
+  save_rect="true"
+  single_instance="true"
+  reuse_instance="true"
+  title="POST TO FACEBOOK"
+  min_height="501"
+  min_width="304"
+  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"
+     follows="all"
+     halign="center"
+     use_highlighting_on_hover="true">
+     <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_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>
+    <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"
+      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_flickr.xml
index b7ff374d5f..1a9ffd0489 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_flickr.xml
@@ -3,17 +3,17 @@
   positioning="cascading"
   can_close="true"
   can_resize="false"
-  help_topic="floater_social"
+  help_topic="floater_flickr"
   layout="topleft"
-  name="floater_social"
+  name="floater_flickr"
   save_rect="true"
   single_instance="true"
   reuse_instance="true"
-  title="POST TO FACEBOOK"
-  height="482"
+  title="UPLOAD TO FLICKR"
+  height="622"
   width="304">
   <panel
-   height="482"
+   height="622"
    width="304"
    visible="true"
    name="background"
@@ -27,32 +27,21 @@
      tab_height="30"
      tab_position="top"
      top="7"
-     height="437"
-     halign="center">
+     height="577"
+     halign="center"
+     use_highlighting_on_hover="true">
      <panel
-       filename="panel_social_status.xml"
-       class="llsocialstatuspanel"
-       follows="all"
-       label="STATUS"
-       name="panel_social_status"/>
-     <panel
-       filename="panel_social_photo.xml"
-       class="llsocialphotopanel"
+       filename="panel_flickr_photo.xml"
+       class="llflickrphotopanel"
        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"/>
+       name="panel_flickr_photo"/>
      <panel
-       filename="panel_social_account.xml"
-       class="llsocialaccountpanel"
+       filename="panel_flickr_account.xml"
+       class="llflickraccountpanel"
        follows="all"
        label="ACCOUNT"
-       name="panel_social_account"/>     
+       name="panel_flickr_account"/>     
     </tab_container>
     <panel
      name="connection_status_panel"
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 853c209bca..771035b40d 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">
@@ -381,5 +381,31 @@
          top_pad="8"
          width="180"
          name="auto_snapshot_check" />
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="13"
+         layout="topleft"
+         left="10"
+         name="filter_list_label"
+         top_pad="10"
+         width="50">
+            Filter:
+        </text>
+        <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>
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..aa5bfce2e9
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_twitter.xml
@@ -0,0 +1,90 @@
+<?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="502"
+  width="304">
+  <panel
+   height="502"
+   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="457"
+     halign="center"
+     use_highlighting_on_hover="true">
+     <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 767acd1d74..c8fcda9858 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -16,14 +16,6 @@
          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">
         <menu_item_call.on_click
@@ -288,6 +280,28 @@
              parameter="conversation" />
         </menu_item_check>
         <menu_item_separator/>
+      <menu_item_call
+        label="Facebook..."
+        name="Facebook">
+        <menu_item_call.on_click
+          function="Floater.Toggle"
+          parameter="facebook"/>
+      </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="Flickr">
+        <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/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ba6bbd0eed..f49f300868 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6065,7 +6065,21 @@ 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="TwitterConnect"
+   type="notifytip">
+    [MESSAGE]
+  </notification>
+
   <notification
    icon="notify.tga"
    name="PaymentReceived"
diff --git a/indra/newview/skins/default/xui/en/panel_social_account.xml b/indra/newview/skins/default/xui/en/panel_facebook_account.xml
index d7235396fe..122cbfb717 100644
--- a/indra/newview/skins/default/xui/en/panel_social_account.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_account.xml
@@ -2,7 +2,8 @@
 	 height="400"
 	 width="304"
 	 layout="topleft"
-   name="panel_social_account">
+    follows="all"
+   name="panel_facebook_account">
   <string
       name="facebook_connected"
       value="You are connected to Facebook as:" />
@@ -34,6 +35,7 @@
    type="string"/>
   <panel
     layout="topleft"
+    follows="left|top"
     name="panel_buttons"
     height="345"
     left="9">
@@ -69,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_facebook_friends.xml b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
new file mode 100644
index 0000000000..9d21a3a293
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
@@ -0,0 +1,72 @@
+<panel
+	 height="400"
+	 width="304"
+	 layout="topleft"
+    follows="all"
+   name="panel_facebook_friends">
+  <string
+   name="facebook_friends_empty"
+   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." />
+  <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_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="Add these people as SL friends">
+      <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>
+    <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>
diff --git a/indra/newview/skins/default/xui/en/panel_social_photo.xml b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
index c79a246d9d..b5b6dee004 100644
--- a/indra/newview/skins/default/xui/en/panel_social_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
@@ -2,7 +2,8 @@
       height="400"
       width="304"
       layout="topleft"
-      name="panel_social_photo">
+      follows="all"
+      name="panel_facebook_photo">
       <layout_stack
 	   layout="topleft"
        border_size="0"
@@ -15,7 +16,7 @@
          name="snapshot_panel"
          height="367">
             <combo_box
-             control_name="SocialPhotoResolution"
+             control_name="FacebookPhotoResolution"
              follows="left|top"
              top="6"
              left="9"
@@ -39,27 +40,32 @@
                label="1024x768"
                name="1024x768"
                value="[i1024,i768]" />
+              <combo_box.item
+               label="1200x630"
+               name="1200x630"
+               value="[i1200,i630]" />
+            </combo_box>
+            <combo_box
+                control_name="FacebookPhotoFilters"
+                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>
-            <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"
+                follows="left|top|right"
                 left="9">
             </panel>
             <button
@@ -81,7 +87,7 @@
                 text_color="EmphasisColor"
                 height="14"
                 top_pad="-19"
-                left_pad="-20"
+                left_pad="-30"
                 length="1"
                 halign="center"
                 name="working_lbl"
@@ -91,6 +97,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"
@@ -103,7 +123,7 @@
               Comment (optional):
             </text>
             <text_editor
-             follows="left|top"
+             follows="left|top|right|bottom"
              height="87"
              width="250"
              left="9"
@@ -118,7 +138,7 @@
           name="photo_button_panel"
           height="25">
           <button
-           follows="left|top"
+           follows="left|bottom"
            top="0"
            left="9"
            height="23"
@@ -129,7 +149,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_social_place.xml b/indra/newview/skins/default/xui/en/panel_facebook_place.xml
index 13e94f6998..84c87df523 100644
--- a/indra/newview/skins/default/xui/en/panel_social_place.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_place.xml
@@ -2,7 +2,8 @@
       height="400"
       width="304"
 	  layout="topleft"
-      name="panel_social_place">
+      follows="all"
+      name="panel_facebook_place">
       <layout_stack
 	    layout="topleft"
         border_size="0"
@@ -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_social_status.xml b/indra/newview/skins/default/xui/en/panel_facebook_status.xml
index 54cfa3f524..480abec558 100644
--- a/indra/newview/skins/default/xui/en/panel_social_status.xml
+++ b/indra/newview/skins/default/xui/en/panel_facebook_status.xml
@@ -1,8 +1,9 @@
     <panel
 	 height="400"
 	 width="304"
+     follows="all"
 	 layout="topleft"
-     name="panel_social_status">
+     name="panel_facebook_status">
      <layout_stack
       layout="topleft"
       border_size="0"
@@ -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"
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..506d2e2f74
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_flickr_account.xml
@@ -0,0 +1,75 @@
+<panel
+	 height="540"
+	 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-Flickr/ta-p/2435609 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..8d8ef45c0d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -0,0 +1,245 @@
+    <panel
+      height="540"
+      width="304"
+      layout="topleft"
+      name="panel_flickr_photo">
+      <layout_stack
+	   layout="topleft"
+       border_size="0"
+       height="532"
+       follows="all"
+       orientation="vertical"
+       name="stack_photo"
+       top="8">
+        <layout_panel	
+         name="snapshot_panel"
+         height="507">
+            <combo_box
+             control_name="FlickrPhotoResolution"
+             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>
+            <combo_box
+               control_name="FlickrPhotoFilters"
+               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"
+                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="-30"
+                length="1"
+                halign="center"
+                name="working_lbl"
+                translate="false"
+                type="string"
+                visible="true"
+                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"
+             font="SansSerif"
+             height="16"
+             left="9"
+             name="title_label"
+             top_pad="15"
+             type="string">
+              Title:
+            </text>
+            <line_editor
+             follows="left|top"
+             height="20"
+             width="250"
+             left="9"
+             length="1"
+             max_length="256"
+             name="photo_title"
+             type="string">
+            </line_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_description"
+             type="string"
+             word_wrap="true">
+            </text_editor>
+            <check_box
+             follows="left|top"
+             initial_value="true"
+             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"
+             name="rating_combobox"
+             tool_tip="Flickr content rating"
+             height="21"
+             width="250">
+              <combo_box.item
+               label="Safe Flickr rating"
+               name="SafeRating"
+               value="1" />
+              <combo_box.item
+               label="Moderate Flickr rating"
+               name="ModerateRating"
+               value="2" />
+              <combo_box.item
+               label="Restricted Flickr rating"
+               name="RestrictedRating"
+               value="3" />
+            </combo_box>
+        </layout_panel>
+        <layout_panel
+          name="photo_button_panel"
+          height="25">
+          <button
+           follows="left|top"
+           top="0"
+           left="9"
+           height="23"
+           label="Upload"
+           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_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>
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..ee4f6396e1
--- /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-Twitter/ta-p/2435453 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..c2be56da21
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_twitter_photo.xml
@@ -0,0 +1,193 @@
+    <panel
+      height="420"
+      width="304"
+      layout="topleft"
+      name="panel_twitter_photo">
+      <layout_stack
+	   layout="topleft"
+       border_size="0"
+       height="412"
+       follows="all"
+       orientation="vertical"
+       name="stack_photo"
+       top="8">
+        <layout_panel
+         name="text_panel"
+         height="160">
+          <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
+           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"
+           width="250"
+           left="9"
+           length="1"
+           max_length="140"
+           name="photo_status"
+           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"
+           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="TwitterPhotoResolution"
+             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>
+              <combo_box
+                  control_name="TwitterPhotoFilters"
+                  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"
+                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="-30"
+                length="1"
+                halign="center"
+                name="working_lbl"
+                translate="false"
+                type="string"
+                visible="true"
+                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"
+          height="25">
+          <button
+           follows="left|top"
+           top="0"
+           left="9"
+           height="23"
+           label="Tweet"
+           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 9043872871..ba95d701ab 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -184,15 +184,40 @@ 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 Twitter -->
+  <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>
+  <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 -->
+	<!-- SLShare: User Friendly Filter Names Translation -->
+    <string name="BlackAndWhite">Black &amp; White</string>
+    <string name="Colors1970">1970&apos;s Colors</string>
+    <string name="Intense">Intense</string>
+    <string name="Newspaper">Newsprint</string>
+    <string name="Sepia">Sepia</string>
+    <string name="Spotlight">Spotlight</string>
+    <string name="Video">Video</string>
+    <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 -->
@@ -3493,6 +3518,12 @@ 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="twitter_post_success">
+    You posted to Twitter.
+  </string>
 
   <string name="no_session_message">
     (IM Session Doesn't Exist)
@@ -3910,6 +3941,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>
@@ -3925,8 +3958,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_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>
 
@@ -3938,6 +3971,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>
@@ -3953,8 +3988,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_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>