summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-07-19 17:55:44 -0700
committerMerov Linden <merov@lindenlab.com>2013-07-19 17:55:44 -0700
commitae4c17dee1cfc6a11ea165c5bd140d75203cfe69 (patch)
tree6bc814651ec67ea42b8bcf3e0d2bd5f776b1bd96 /indra/newview/skins/default
parent652ec2feeeb39c5c7ec9553563e3fdc29c66780d (diff)
parentc3c61018cd2d6547c4976c04edc4d3212cf3fb31 (diff)
Pull merge from lindenlab/viewer-fbc
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/panel_social_account.xml21
1 files changed, 13 insertions, 8 deletions
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..8706aac5ce 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"
@@ -25,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"
@@ -53,7 +56,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 +68,8 @@
height="23"
label="Disconnect"
name="disconnect_btn"
- width="210">
+ width="210"
+ visible="false">
<commit_callback function="SocialSharing.Disconnect"/>
</button>
</panel>