merge

4 files changed, 43 insertions, 24 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_social.xml b/indra/newview/skins/default/xui/en/floater_social.xml
index 3eff2c2ae1..39df777d1b 100644
--- a/indra/newview/skins/default/xui/en/floater_social.xml
+++ b/indra/newview/skins/default/xui/en/floater_social.xml
@@ -54,7 +54,7 @@
        filename="panel_social_place.xml"
        class="llsocialcheckinpanel"
        follows="all"
-       label="PLACE"
+       label="CHECK IN"
        help_topic="panel_social_place"
        name="panel_social_place"/>
      <panel
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 1f20d3ab58..a3592bce4a 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5992,6 +5992,14 @@ Please select at least one type of content to search (General, Moderate, or Adul
 [MESSAGE]
   </notification>
 
+ <notification
+  icon="notify.tga"
+  name="FacebookConnect"
+  persist="true"
+  type="notifytip">
+[MESSAGE]
+ </notification>
+    
   <notification
    icon="notify.tga"
    name="PaymentReceived"
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 5855eeed59..957d117d9d 100644
--- a/indra/newview/skins/default/xui/en/panel_social_account.xml
+++ b/indra/newview/skins/default/xui/en/panel_social_account.xml
@@ -37,28 +37,39 @@
     name="panel_buttons"
     height="345"
     left="9">
-  <button
-   layout="topleft"
-   follows="left|top"
-   top_pad="9"
-   visible="true"
-   height="23"
-   label="Connect..."
-   name="connect_btn"
-   width="210">
-    <commit_callback function="SocialSharing.Connect"/>
-  </button>
+    <button
+     layout="topleft"
+     follows="left|top"
+     top_pad="9"
+     visible="true"
+     height="23"
+     label="Connect..."
+     name="connect_btn"
+     width="210">
+      <commit_callback function="SocialSharing.Connect"/>
+    </button>
 
-  <button
-   layout="topleft"
-   follows="left|top"
-   top_delta="0"
-   height="23"
-   label="Disconnect"
-   name="disconnect_btn"
-   width="210"
-   visible="false">
-    <commit_callback function="SocialSharing.Disconnect"/>
-  </button>
+    <button
+     layout="topleft"
+     follows="left|top"
+     top_delta="0"
+     height="23"
+     label="Disconnect"
+     name="disconnect_btn"
+     width="210"
+     visible="false">
+      <commit_callback function="SocialSharing.Disconnect"/>
+    </button>
+    <text
+      layout="topleft"
+      length="1"
+      follows="top|left"
+      height="16"
+      left="3"
+      name="account_learn_more_label"
+      top_pad="5"
+      type="string">
+      [https://support.secondlife.com/ Learn more.]
+    </text>
   </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d75b65896c..6d94923dba 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3430,7 +3430,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   </string>
 
   <string name="facebook_post_success">
-    Posting to Facebook was successful.
+    You posted to Facebook.
   </string>
 
   <string name="no_session_message">