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

---
 .../default/xui/en/panel_facebook_friends.xml      | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_facebook_friends.xml

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

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 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/panel_facebook_friends.xml | 1 +
 1 file changed, 1 insertion(+)

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

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"
-- 
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/xui/en/panel_facebook_friends.xml')

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/xui/en/panel_facebook_friends.xml')

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/xui/en/panel_facebook_friends.xml')

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