From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 29 Mar 2013 07:50:08 -0700
Subject: Update Mac and Windows breakpad builds to latest

---
 indra/newview/skins/default/xui/en/floater_snapshot.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 indra/newview/skins/default/xui/en/floater_snapshot.xml

(limited to 'indra/newview/skins/default/xui/en/floater_snapshot.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From e17b9de293084da0de0ce12290c9ae1939184337 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 31 May 2013 19:07:09 -0700
Subject: ACME-453, ACME-455, ACME-456, ACME-465 : Duplicate and tweak the
 Snapshot Profile UI to create the Snapshot Facebook UI

---
 .../skins/default/xui/en/floater_snapshot.xml      | 24 +++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_snapshot.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 49d64767cc..e8e7fb77c1 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -21,7 +21,11 @@
         Sending Email
     </string>
     <string
-     name="profile_progress_str">
+        name="facebook_progress_str">
+        Posting to Facebook
+    </string>
+    <string
+        name="profile_progress_str">
         Posting
     </string>
     <string
@@ -33,7 +37,11 @@
         Saving to Computer
     </string>
  	<string
- 	 name="profile_succeeded_str">
+        name="facebook_succeeded_str">
+ 	    Image uploaded
+ 	</string>
+ 	<string
+        name="profile_succeeded_str">
  	    Image uploaded
  	</string>
  	<string
@@ -49,7 +57,11 @@
  	    Saved to Computer!
  	</string>
  	<string
- 	 name="profile_failed_str">
+        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>
  	<string
@@ -256,6 +268,12 @@
        left="0"
        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"
-- 
cgit v1.2.3


From 1c7a7fe2d1c3f9399a6248551b7b2a8a7e68afdd Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Fri, 28 Jun 2013 23:08:03 +0100
Subject: removed FB photo sharing from snapshot floater for ACME-639

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

(limited to 'indra/newview/skins/default/xui/en/floater_snapshot.xml')

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
@@ -268,12 +268,6 @@
        left="0"
        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"
-- 
cgit v1.2.3