From 7bcda3a511f47a465cb8e22eb3c36e1e82d19f17 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 1 Aug 2013 20:53:27 -0700 Subject: ACME-785 : Use a specific notifytip message (without the OK button) for fbc success notification --- indra/newview/llfacebookconnect.cpp | 2 +- indra/newview/skins/default/xui/en/notifications.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp index a7b7224d28..0179b3f6b1 100644 --- a/indra/newview/llfacebookconnect.cpp +++ b/indra/newview/llfacebookconnect.cpp @@ -61,7 +61,7 @@ void toast_user_for_success() { LLSD args; args["MESSAGE"] = LLTrans::getString("facebook_post_success"); - LLNotificationsUtil::add("SystemMessage", args); + LLNotificationsUtil::add("FacebookConnect", args); } /////////////////////////////////////////////////////////////////////////////// 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] + +[MESSAGE] + + Date: Thu, 1 Aug 2013 21:46:37 -0700 Subject: ACME-761 : Use the cap for the service url unless overridden by the SLShareHost setting from settings.xml --- indra/newview/llfacebookconnect.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'indra') diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp index 26fc480658..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" @@ -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; } -- cgit v1.2.3 From 93e8ec86dc08ace8bf9a20a0d14b38d47f961c47 Mon Sep 17 00:00:00 2001 From: Cho Date: Fri, 2 Aug 2013 19:21:38 +0100 Subject: changed PLACE to CHECK IN for ACME-794 --- indra/newview/skins/default/xui/en/floater_social.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') 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"/> Date: Fri, 2 Aug 2013 19:54:42 +0100 Subject: changed facebook_post_success text to be more consistent with other notification text for ACME-793 --- indra/newview/skins/default/xui/en/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') 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]. - Posting to Facebook was successful. + You posted to Facebook. -- cgit v1.2.3 From dd70cc8f32aab7712f92198c43c8b4d86b8c5e73 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 2 Aug 2013 12:44:50 -0700 Subject: ACME : Fix a spurious crash when showing the Advanced->Shortcuts menu just after launch --- indra/newview/llfloatersocial.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') 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; -- cgit v1.2.3 From 5728cc8d6fe315e2234f77f4c079b60ffaa7f8db Mon Sep 17 00:00:00 2001 From: Cho Date: Fri, 2 Aug 2013 20:59:46 +0100 Subject: added learn more link to panel_social_account for ACME-797 --- .../skins/default/xui/en/panel_social_account.xml | 55 +++++++++++++--------- 1 file changed, 33 insertions(+), 22 deletions(-) (limited to 'indra') 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"> - + - + + + [https://support.secondlife.com/ Learn more.] + -- cgit v1.2.3