From b2e2282e988ab8c7d989d8554a41fda8b8c6e691 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 18 Jul 2013 16:13:14 -0700
Subject: ACME-727 Display 'Not connected to Facebook' when the user does not
 have a FB token

---
 .../newview/skins/default/xui/en/panel_social_account.xml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_social_account.xml b/indra/newview/skins/default/xui/en/panel_social_account.xml
index 838a9ba064..470e0848d2 100644
--- a/indra/newview/skins/default/xui/en/panel_social_account.xml
+++ b/indra/newview/skins/default/xui/en/panel_social_account.xml
@@ -3,7 +3,12 @@
 	 width="304"
 	 layout="topleft"
    name="panel_social_account">
-
+  <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"
@@ -14,7 +19,7 @@
    name="account_caption_label"
    top="21"
    type="string">
-    You are connected to Facebook as:
+    Not connected to Facebook.
   </text>
   <text
    layout="topleft"
@@ -53,7 +58,8 @@
    height="23"
    label="Use another account..."
    name="use_another_account_btn"
-   width="210">
+   width="210"
+   visible="false">
     <commit_callback function="SocialSharing.UseAnotherAccount"/>
   </button>
 
@@ -64,7 +70,8 @@
    height="23"
    label="Disconnect"
    name="disconnect_btn"
-   width="210">
+   width="210"
+   visible="false">
     <commit_callback function="SocialSharing.Disconnect"/>
   </button>
   </panel>
-- 
cgit v1.2.3


From c3c61018cd2d6547c4976c04edc4d3212cf3fb31 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 19 Jul 2013 16:36:55 -0700
Subject: ACME-732 Create the viewer side info route responder

---
 indra/newview/skins/default/xui/en/panel_social_account.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_social_account.xml b/indra/newview/skins/default/xui/en/panel_social_account.xml
index 470e0848d2..8706aac5ce 100644
--- a/indra/newview/skins/default/xui/en/panel_social_account.xml
+++ b/indra/newview/skins/default/xui/en/panel_social_account.xml
@@ -30,10 +30,8 @@
    height="16"
    left="9"
    name="account_name_label"
-   type="string">
-    [secondlife:/// Philippe Bossut]
-  </text>
-
+   parse_urls="true"
+   type="string"/>
   <panel
     layout="topleft"
     name="panel_buttons"
-- 
cgit v1.2.3