Merged in default (pull request #839)

SL-10994 Removed Facebook In-world Sharing

Approved-by: Andrey Kleshchev

12 files changed, 2 insertions, 663 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_facebook.xml b/indra/newview/skins/default/xui/en/floater_facebook.xml
deleted file mode 100644
index b34d70516a..0000000000
--- a/indra/newview/skins/default/xui/en/floater_facebook.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<floater
-  positioning="cascading"
-  can_close="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="462"
-  min_width="304"
-  height="462"
-  width="272">
-   <tab_container
-     name="tabs"
-     tab_group="1"
-     tab_min_width="64"
-     tab_height="21"
-     tab_position="top"
-     top="7"
-     height="437"
-     follows="all"
-     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_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>
-     <text
-      name="connection_error_text"
-      type="string"
-      follows="left|bottom|right"
-      bottom="-5"
-      left="10"
-      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_delta="-2"
-      left="10"
-      visible="true"/>
-     <text
-      name="connection_loading_text"
-      type="string"
-      follows="left|bottom|right"
-      top_delta="2"
-      left_pad="5"
-      width="250"
-      height="20"
-      wrap="true"
-      halign="left"
-      valign="center"
-      text_color="EmphasisColor"
-      font="SansSerif">
-      Loading...
-    </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index e50747cb5f..832c2ee7da 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -24,10 +24,6 @@
         Sending Email
     </string>
     <string
-        name="facebook_progress_str">
-        Posting to Facebook
-    </string>
-    <string
         name="profile_progress_str">
         Posting
     </string>
@@ -40,10 +36,6 @@
         Saving to Computer
     </string>
  	<string
-        name="facebook_succeeded_str">
- 	    Image uploaded
- 	</string>
- 	<string
         name="profile_succeeded_str">
  	    Image uploaded
  	</string>
@@ -60,10 +52,6 @@
  	    Saved to Computer!
  	</string>
  	<string
-     name="facebook_failed_str">
- 	    Failed to upload image to your Facebook timeline.
- 	</string>
- 	<string
      name="profile_failed_str">
  	    Failed to upload image to your Profile Feed.
  	</string>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 9998f33c52..87a0bb7d70 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -307,13 +307,6 @@
         </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
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b7cd6517ea..77db71d536 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6705,13 +6705,6 @@ Please select at least one type of content to search (General, Moderate, or Adul
 [MESSAGE]
   </notification>
 
- <notification
-  icon="notify.tga"
-  name="FacebookConnect"
-  type="notifytip">
-[MESSAGE]
- </notification>
-
   <notification
    icon="notify.tga"
    name="FlickrConnect"
diff --git a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml b/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
deleted file mode 100644
index 97994fb08b..0000000000
--- a/indra/newview/skins/default/xui/en/panel_facebook_friends.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<panel
-	 height="400"
-	 width="272"
-	 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 Status tab to connect and enable this feature." />
-  <accordion
- background_visible="false"
- bg_alpha_color="DkGray2"
- bg_opaque_color="DkGray2"
-   follows="all"
-   height="383"
-   layout="topleft"
-   left="10"
-   name="friends_accordion"
-   right="-10"
-   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="272" />
-    </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="272" />
-    </accordion_tab>
-  </accordion>
-    <text
-        layout="topleft"
-        word_wrap="true"
-        height="64"
-        width="250"
-        follows="top|left|right"
-        font="SansSerif"
-        left="10"
-		right="-10"
-        name="facebook_friends_status"
-        top="5"
-        type="string">
-        Not connected to Facebook.
-    </text>
-</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
deleted file mode 100644
index 97355f4689..0000000000
--- a/indra/newview/skins/default/xui/en/panel_facebook_photo.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-    <panel
-      height="400"
-      width="272"
-      layout="topleft"
-      follows="all"
-      name="panel_facebook_photo">
-            <combo_box
-             control_name="FacebookPhotoResolution"
-             follows="left|top"
-			 layout="topleft"
-             top="7"
-             left="10"
-             name="resolution_combobox"
-             tool_tip="Image resolution"
-             height="21"
-             width="124">
-              <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.item
-               label="1200x630"
-               name="1200x630"
-               value="[i1200,i630]" />
-            </combo_box>
-            <combo_box
-                control_name="FacebookPhotoFilters"
-                follows="left|top"
-				layout="topleft"
-                name="filters_combobox"
-                tool_tip="Image filters"
-                top="7"
-                left_pad="4"
-                height="21"
-                width="124">
-                <combo_box.item
-                label="No Filter"
-                name="NoFilter"
-                value="NoFilter" />
-            </combo_box>
-            <panel
-                height="150"
-                width="252"
-                visible="true"
-				layout="topleft"
-                name="thumbnail_placeholder"
-                top_pad="5"
-                follows="left|top|rith"
-				right="-10"
-                left="10">
-            </panel>
-			<text
-                follows="left|top"
-				layout="topleft"
-                font="SansSerif"
-                text_color="EmphasisColor"
-                height="14"
-                top_pad="2"
-                left="10"
-                length="1"
-                halign="center"
-                name="working_lbl"
-                translate="false"
-                type="string"
-                visible="true"
-                width="251">
-                Refreshing...
-            </text>
-			<view_border 
-			 bevel_style="in"
-			 follows="left|top"
-			 layout="topleft"
-			 height="1"
-			 left="10"
-			 name="refresh_border"
-			 width="250"
-			 top_pad="0"/>
-            <button
-             follows="left|top"
-			 layout="topleft"
-             height="23"
-             label="Refresh"
-             left="10"
-             top_pad="5"
-             name="new_snapshot_btn"
-             tool_tip="Click to refresh"
-             visible="true"
-             width="100" >
-             <button.commit_callback
-               function="SocialSharing.RefreshPhoto" />
-            </button>
-            <button
-                follows="right|top"
-				layout="topleft"
-                height="23"
-                label="Preview"
-                right="-10"
-                top_delta="0"
-                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"
-			 layout="topleft"
-             font="SansSerif"
-             height="16"
-             left="10"
-             name="caption_label"
-             top_pad="20"
-             type="string">
-              Comment (optional):
-            </text>
-            <text_editor
-             follows="left|top|right|bottom"
-			 layout="topleft"
-             height="87"
-             width="250"
-             left="10"
-			 right="-10"
-             length="1"
-             max_length="700"
-             name="photo_caption"
-             spellcheck="true"
-             type="string"
-             word_wrap="true">
-            </text_editor>
-          <button
-           follows="left|top"
-		   layout="topleft"
-           top_pad="22"
-           left="10"
-           height="23"
-           label="Post"
-           name="post_photo_btn"
-           width="100">
-            <button.commit_callback
-             function="SocialSharing.SendPhoto" />
-          </button>
-          <button
-               follows="right|top"
-			   layout="topleft"
-               height="23"
-               label="Cancel"
-               name="cancel_photo_btn"
-               right="-10"
-               top_delta="0"
-               width="100">
-            <button.commit_callback
-             function="SocialSharing.Cancel" />
-          </button>
-    </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
deleted file mode 100644
index f87b008c4e..0000000000
--- a/indra/newview/skins/default/xui/en/panel_facebook_place.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-    <panel
-      height="400"
-      width="272"
-	  layout="topleft"
-      follows="all"
-      name="panel_facebook_place">
-          <text
-            length="1"
-            follows="top|left|right"
-			layout="topleft"
-            font="SansSerif"
-            height="16"
-            left="10"
-            name="place_caption_label"
-            top="5"
-            type="string">
-            Say something about where you are:
-          </text>
-          <text_editor
-            follows="top|left|right"
-			layout="topleft"
-            height="70"
-            width="250"
-            left="10"
-			right="-10"
-            length="1"
-            max_length="700"
-            name="place_caption"
-            type="string"
-            word_wrap="true">
-           </text_editor>
-		  <check_box
-              follows="left|top"
-			  layout="topleft"
-              initial_value="false"
-			  height="16"
-              top_pad="8"
-              width="8"
-              label="Include overhead view of location"
-              name="add_place_view_cb"
-              left="10"/>
-              <panel
-                  follows="left|top"
-				  layout="topleft"
-                  height="243"
-                  width="250"
-                  background_visible="true"
-                  bg_opaque_color="Black"
-                  bg_alpha_color="Black"
-                  top_pad="8"
-                  left="10"
-				  right="-12"
-                  visible="true"
-                  name="map_border">
-              </panel>
-              <icon
-                follows="left|top"
-				layout="topleft"
-                height="243"
-                width="250"
-                image_name="Map_Placeholder_Icon"
-                top_delta="0"
-				right="-12"
-                left="10"
-                visible="true"
-                name="map_placeholder">
-              </icon>
-              <icon
-                  follows="left|top"
-				  layout="topleft"
-                  height="243"
-                  width="250"
-                  image_name="Map_Placeholder_Icon"
-                  top_delta="0"
-                  left="10"
-				  right="-12"
-                  visible="true"
-                  name="map_default">
-              </icon>
-			  <loading_indicator
-              follows="left|top"
-			  layout="topleft"
-              height="24"
-              width="24"
-              name="map_loading_indicator"
-              top_delta="116"
-              left="126"
-              visible="false"/>
-            <button
-              follows="left|bottom"
-			  layout="topleft"
-              top_pad="95"
-              left="10"
-              height="23"
-              label="Post"
-              name="post_place_btn"
-              width="100">
-              <button.commit_callback
-                 function="SocialSharing.SendCheckin" />
-            </button>
-            <button
-              follows="right|bottom"
-			  layout="topleft"
-              height="23"
-              label="Cancel"
-              name="cancel_place_btn"
-              right="-10"
-              top_delta="0"
-              width="100">
-              <button.commit_callback
-                  function="SocialSharing.Cancel" />
-            </button>
-    </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
deleted file mode 100644
index fe0f3c9279..0000000000
--- a/indra/newview/skins/default/xui/en/panel_facebook_status.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-    <panel
-	 height="400"
-	 width="272"
-     follows="all"
-	 layout="topleft"
-     name="panel_facebook_status">
-        <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="10"
-   name="account_caption_label"
-   top="5"
-   type="string">
-    Not connected to Facebook.
-  </text>
-  <text
-   layout="topleft"
-   top_pad="2"
-   length="1"
-   follows="top|left"
-   font="SansSerif"
-   height="16"
-   left="10"
-   name="account_name_label"
-   parse_urls="true"
-   type="string"/>
-  <panel
-    layout="topleft"
-    follows="left|top"
-    name="panel_buttons"
-    height="60"
-    left="0">
-    <button
-     layout="topleft"
-     follows="left|top"
-     top_pad="9"
-     left="10"
-     visible="true"
-     height="23"
-     label="Connect..."
-     name="connect_btn"
-     width="251">
-      <commit_callback function="SocialSharing.Connect"/>
-    </button>
-
-    <button
-     layout="topleft"
-     follows="left|top|right"
-     top_delta="0"
-     left="10"
-     right="-10"
-     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|right"
-      left="10"
-      right="-10"
-      height="16"
-      name="account_learn_more_label"
-      top_pad="5"
-      type="string">
-      [http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Share-Facebook/ta-p/2149711 Learn about posting to Facebook]
-    </text>
-  </panel>
-        
-       <text
-        length="1"
-        layout="topleft"
-        follows="top|left|right"
-        font="SansSerif"
-        height="16"
-        left="10"
-        name="status_caption_label"
-        top_pad="5"
-        type="string">
-        What's on your mind?
-       </text>
-       <text_editor
-        follows="left|top|right"
-        layout="topleft"
-        height="150"
-        width="252"
-        left="10"
-        length="1"
-        max_length="700"
-        name="status_message"
-        type="string"
-        word_wrap="true">
-       </text_editor>
-       <button
-        follows="left|top"
-        layout="topleft"
-        top_pad="6"
-        left="10"
-        height="23"
-        label="Post"
-        name="post_status_btn"
-        width="100">
-        <button.commit_callback
-          function="SocialSharing.SendStatus" />
-       </button>
-       <button
-        follows="right|top"
-        layout="topleft"
-        height="23"
-        label="Cancel"
-        name="cancel_status_btn"
-        right="-10"
-        top_delta="0"
-        width="100">
-        <button.commit_callback
-          function="SocialSharing.Cancel" />
-       </button>
-    </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 8fc0f6f642..a47121ae99 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -367,24 +367,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
                          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">
-                <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_tab>           
             </accordion>
             <text
              follows="all"
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 305cce1cbe..981b9ab881 100644
--- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
@@ -61,23 +61,6 @@
    font="SansSerif"
    halign="left"
    height="22"
-   image_overlay="Snapshot_Facebook"
-   image_overlay_alignment="left"
-   image_top_pad="0"
-   imgoverlay_label_space="10"
-   label="Share to Facebook"
-   layout="topleft"
-   left_delta="0"
-   name="send_to_facebook_btn"
-   top_pad="5">
-    <button.commit_callback
-     function="Snapshot.SendToFacebook"/>
-  </button>
-  <button
-   follows="left|top"
-   font="SansSerif"
-   halign="left"
-   height="22"
    image_overlay="Command_Twitter_Icon"
    image_overlay_alignment="left"
    image_top_pad="0"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e567e410bc..1e4ab75d66 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -202,13 +202,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 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>
+	<!-- SLShare: Flickr and Twitter -->
   <string name="SocialFlickrConnecting">Connecting to Flickr...</string>
   <string name="SocialFlickrPosting">Posting...</string>
   <string name="SocialFlickrDisconnecting">Disconnecting from Flickr...</string>
@@ -3656,9 +3650,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
     Drag items from inventory here
   </string>
 
-  <string name="facebook_post_success">
-    You posted to Facebook.
-  </string>
   <string name="flickr_post_success">
     You posted to Flickr.
   </string>
@@ -4090,7 +4081,6 @@ 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_Grid_Status_Label">Grid status</string>
@@ -4123,7 +4113,6 @@ 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_Grid_Status_Tooltip">Show current Grid status</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/person_view.xml b/indra/newview/skins/default/xui/en/widgets/person_view.xml
index 46c1b7ff75..bfe6941a8a 100644
--- a/indra/newview/skins/default/xui/en/widgets/person_view.xml
+++ b/indra/newview/skins/default/xui/en/widgets/person_view.xml
@@ -13,16 +13,6 @@
   text_pad_right="4"
   arrow_size="10"
   max_folder_item_overlap="2">
-    <facebook_icon
-      follows="left"
-      height="14"
-      image_name="Facebook_Icon"
-      left="5"
-      bottom="6"
-      name="facebook_icon"
-      tool_tip="Facebook User"
-      visible="false"
-      width="14" />
     <avatar_icon
       follows="left"
       layout="topleft"