From d63dd9d442a2c30b26163cdaf475ed31070aa92b Mon Sep 17 00:00:00 2001 From: Gilbert Gonzales Date: Tue, 25 Jun 2013 13:44:21 -0700 Subject: ACME-588 Make 'Post' button post to facebook --- indra/newview/llfloatersocial.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp index f2110e09c1..52a4e090f3 100644 --- a/indra/newview/llfloatersocial.cpp +++ b/indra/newview/llfloatersocial.cpp @@ -350,9 +350,11 @@ void LLSocialPhotoPanel::onSend() else caption = caption + " " + slurl.getSLURLString(); } - //LLFacebookConnect::instance().sharePhoto(LLFloaterSnapshot::getImageData(), caption); - //LLWebProfile::uploadImage(LLFloaterSnapshot::getImageData(), caption, add_location, boost::bind(&LLPanelSnapshotFacebook::onImageUploaded, this, caption, _1)); - //LLFloaterSnapshot::postSave(); + + LLSnapshotLivePreview* previewp = getPreviewView(); + + LLFacebookConnect::instance().sharePhoto(previewp->getFormattedImage(), caption); + updateControls(); } -- cgit v1.2.3 From e92e5a3d5337204c10a8417bb0ad480d591b4b90 Mon Sep 17 00:00:00 2001 From: Gilbert Gonzales Date: Tue, 25 Jun 2013 13:53:38 -0700 Subject: ACME-592 Clicking 'Post' should close the Facebook floater --- indra/newview/llfloatersocial.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra') diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp index 23e3d35c22..9b27024eed 100644 --- a/indra/newview/llfloatersocial.cpp +++ b/indra/newview/llfloatersocial.cpp @@ -380,6 +380,13 @@ void LLSocialPhotoPanel::onSend() LLFacebookConnect::instance().sharePhoto(previewp->getFormattedImage(), caption); updateControls(); + + // Close the floater once "Post" has been pushed + LLFloater* floater = getParentByType(); + if (floater) + { + floater->closeFloater(); + } } -- cgit v1.2.3 From b497b121ed2d8964160ee79003debb9f5ab62a49 Mon Sep 17 00:00:00 2001 From: Cho Date: Tue, 25 Jun 2013 23:19:53 +0100 Subject: used default SL logo for image-less checkins for ACME-613 --- indra/newview/llfloatersocial.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llfloatersocial.cpp b/indra/newview/llfloatersocial.cpp index 9b27024eed..b3c0481968 100644 --- a/indra/newview/llfloatersocial.cpp +++ b/indra/newview/llfloatersocial.cpp @@ -43,6 +43,7 @@ static LLRegisterPanelClassWrapper t_panel_photo("llsocialph static LLRegisterPanelClassWrapper t_panel_checkin("llsocialcheckinpanel"); const S32 MAX_POSTCARD_DATASIZE = 1024 * 1024; // one megabyte +const std::string DEFAULT_CHECKIN_ICON_URL = "http://logok.org/wp-content/uploads/2010/07/podcastlogo1.jpg"; std::string get_map_url() { @@ -411,7 +412,7 @@ void LLSocialCheckinPanel::onSend() // Optionally add the region map view bool add_map_view = getChild("add_place_view_cb")->getValue().asBoolean(); - std::string map_url = (add_map_view ? get_map_url() : ""); + std::string map_url = (add_map_view ? get_map_url() : DEFAULT_CHECKIN_ICON_URL); // Get the caption std::string caption = getChild("place_caption")->getValue().asString(); -- cgit v1.2.3