merge

6 files changed, 58 insertions, 30 deletions

diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp
index dbebe8d14a..e4ac2a4960 100644
--- a/indra/newview/llfacebookconnect.cpp
+++ b/indra/newview/llfacebookconnect.cpp
@@ -40,6 +40,7 @@
 #include "llimagejpeg.h"
 #include "lltrans.h"
 #include "llevents.h"
+#include "llviewerregion.h"
 
 #include "llfloaterwebcontent.h"
 #include "llfloaterreg.h"
@@ -64,7 +65,7 @@ void toast_user_for_success()
 {
 	LLSD args;
     args["MESSAGE"] = LLTrans::getString("facebook_post_success");
-    LLNotificationsUtil::add("SystemMessage", args);
+    LLNotificationsUtil::add("FacebookConnect", args);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -339,13 +340,21 @@ void LLFacebookConnect::openFacebookWeb(std::string url)
 
 std::string LLFacebookConnect::getFacebookConnectURL(const std::string& route)
 {
-	//TODO GIL : Remove this code along with extern and llcontrol.h header
+	static std::string sFacebookConnectUrl = gAgent.getRegion()->getCapability("FacebookConnect");
+    
+	//*TODO : Remove this code along with extern and llcontrol.h header
 	std::string host = gSavedSettings.getString("SLShareHost");
-	//static std::string sFacebookConnectUrl = gAgent.getRegion()->getCapability("FacebookConnect");
-	static std::string sFacebookConnectUrl = host + "/fbc/agent/" + gAgentID.asString(); // TEMPORARY HACK FOR FB DEMO - Cho
+    if (!host.empty())
+    {
+        sFacebookConnectUrl = host + "/fbc/agent/" + gAgentID.asString(); // TEMPORARY HACK FOR FB DEMO - Cho
+    }
+    else
+    {
+        sFacebookConnectUrl = gAgent.getRegion()->getCapability("FacebookConnect");
+    }
+    //End removable part
 
 	std::string url = sFacebookConnectUrl + route;
-	llinfos << url << llendl;
 	return url;
 }
 
diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp
index 4c8aec4e99..4cbc9c0218 100644
--- a/indra/newview/llfloatersocial.cpp
+++ b/indra/newview/llfloatersocial.cpp
@@ -374,7 +374,7 @@ void LLSocialPhotoPanel::updateControls()
 	LLSnapshotLivePreview* previewp = getPreviewView();
 	BOOL got_bytes = previewp && previewp->getDataSize() > 0;
 	BOOL got_snap = previewp && previewp->getSnapshotUpToDate();
-	LLSnapshotLivePreview::ESnapshotType shot_type = previewp->getSnapshotType();
+	LLSnapshotLivePreview::ESnapshotType shot_type = (previewp ? previewp->getSnapshotType() : LLSnapshotLivePreview::SNAPSHOT_POSTCARD);
 
 	// *TODO: Separate maximum size for Web images from postcards
 	lldebugs << "Is snapshot up-to-date? " << got_snap << llendl;
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">