removed FB photo sharing from snapshot floater for ACME-639

3 files changed, 0 insertions, 224 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index e8e7fb77c1..853c209bca 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -269,12 +269,6 @@
        name="panel_snapshot_options"
        top="0" />
       <panel
-       class="llpanelsnapshotfacebook"
-       follows="all"
-       layout="topleft"
-       name="panel_snapshot_facebook"
-       filename="panel_snapshot_facebook.xml" />
-      <panel
        class="llpanelsnapshotprofile"
        follows="all"
        layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_facebook.xml b/indra/newview/skins/default/xui/en/panel_snapshot_facebook.xml
deleted file mode 100755
index 7a89ed69b5..0000000000
--- a/indra/newview/skins/default/xui/en/panel_snapshot_facebook.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- height="380"
- layout="topleft"
- name="panel_snapshot_facebook"
- width="490">
-    <icon
-     follows="top|left"
-     height="18"
-     image_name="Snapshot_Facebook"
-     layout="topleft"
-     left="12"
-     mouse_opaque="true"
-     name="title_icon"
-     top="5"
-     width="18" />
-    <text
-     follows="top|left|right"
-     font="SansSerifBold"
-     height="20"
-     layout="topleft"
-     left_pad="12"
-     length="1"
-     name="title"
-     right="-10"
-     text_color="white"
-     type="string"
-     top_delta="4">
-        Post to my Facebook timeline
-    </text>
-    <view_border 
-     bevel_style="in"
-     follows="left|top|right" 
-     height="1"
-     left="10"
-     layout="topleft"
-     name="hr"
-     right="-10"
-     top_pad="5"
-     />
-    <combo_box
-     follows="left|top"
-     height="23"
-     label="Resolution"
-     layout="topleft"
-     left_delta="0"
-     name="facebook_size_combo"
-     top_pad="10"
-     width="250">
-        <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="Custom"
-         name="Custom"
-         value="[i-1,i-1]" />
-    </combo_box>
-    <layout_stack
-     animate="false"
-     follows="all"
-     height="270"
-     layout="bottomleft"
-     name="facebook_image_params_ls"
-     left_delta="0"
-     orientation="vertical"
-     top_pad="10"
-     right="-10">
-        <layout_panel
-         follows="top|left|right"
-         height="55"
-         layout="topleft"
-         left="0"
-         name="facebook_image_size_lp"
-         auto_resize="false"
-         top="0"
-         right="-1"
-         visible="true">
-            <spinner
-             allow_text_entry="false"
-             decimal_digits="0"
-             follows="left|top"
-             height="20"
-             increment="32"
-             label="Width"
-             label_width="40"
-             layout="topleft"
-             left="10"
-             max_val="6016"
-             min_val="32"
-             name="facebook_snapshot_width"
-             top_pad="10"
-             width="95" />
-            <spinner
-             allow_text_entry="false"
-             decimal_digits="0"
-             follows="left|top"
-             height="20"
-             increment="32"
-             label="Height"
-             label_width="40"
-             layout="topleft"
-             left_pad="5"
-             max_val="6016"
-             min_val="32"
-             name="facebook_snapshot_height"
-             top_delta="0"
-             width="95" />
-            <check_box
-              height="10"
-             bottom_delta="20"
-             label="Constrain proportions"
-             layout="topleft"
-             left="10"
-             name="facebook_keep_aspect_check" />
-        </layout_panel>
-        <layout_panel
-         follows="top|left|right"
-         height="200"
-         layout="topleft"
-         left="0"
-         name="facebook_image_metadata_lp"
-         auto_resize="true"
-         top="0"
-         right="-1"
-         visible="true">
-            <text
-             length="1"
-             follows="top|left|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left="0"
-             name="caption_label"
-             right="-10"
-             top_pad="0"
-             type="string">
-                Caption:
-            </text>
-            <text_editor
-             follows="all"
-             height="155"
-             layout="topleft"
-             left_delta="0"
-             length="1"
-             max_length="700"
-             name="caption"
-             right="-10"
-             top_pad="5"
-             type="string"
-             word_wrap="true">
-            </text_editor>
-            <check_box
-             follows="left|bottom"
-             initial_value="true"
-             label="Include location"
-             layout="topleft"
-             left_delta="0"
-             name="add_location_cb"
-             top_pad="15" />
-        </layout_panel>
-    </layout_stack>
-    <button
-     follows="right|bottom"
-     height="23"
-     label="Cancel"
-     layout="topleft"
-     name="cancel_btn"
-     right="-32"
-     top="350"
-     width="100">
-      <button.commit_callback
-       function="SocialSharing.Cancel" />
-    </button>
-    <button
-     follows="right|bottom"
-     height="23"
-     label="Post"
-     layout="topleft"
-     left_delta="-106"
-     name="post_btn"
-     top_delta="0"
-     width="100">
-      <button.commit_callback
-       function="SocialSharing.SendPhoto" />
-    </button>
-</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 8cf5bfb426..61c8c971c2 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_options.xml
@@ -5,25 +5,6 @@
  layout="topleft"
  name="panel_snapshot_options"
  width="490">
- <button
-  follows="left|top|right"
-  font="SansSerif"
-  halign="left"
-  height="38"
-  image_overlay="Snapshot_Facebook"
-  image_overlay_alignment="left"
-  image_top_pad="-2"
-  imgoverlay_label_space="10"
-  label="Post to my Facebook timeline"
-  layout="topleft"
-  left="10"
-  name="save_to_facebook_btn"
-  pad_left="10"
-  right="-10"
-  top="5">
-  <button.commit_callback
-   function="Snapshot.SaveToFacebook" />
-  </button>
   <button
    follows="left|top|right"
    font="SansSerif"