merge

2 files changed, 11 insertions, 1 deletions

diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp
index 86da748f0f..5013a5cb40 100644
--- a/indra/newview/llfacebookconnect.cpp
+++ b/indra/newview/llfacebookconnect.cpp
@@ -211,7 +211,6 @@ public:
     }
 };
 
-
 ///////////////////////////////////////////////////////////////////////////////
 //
 LLFacebookConnect::LLFacebookConnect()
@@ -296,6 +295,16 @@ void LLFacebookConnect::postCheckinMessage(const std::string& message, const std
 	LLHTTPClient::post(getFacebookConnectURL("/share/wall"), body, new LLFacebookPostResponder());
 }
 
+void LLFacebookConnect::sharePhoto(const std::string& image_url, const std::string& caption)
+{
+	LLSD body;
+	body["image"] = image_url;
+	body["caption"] = caption;
+	
+    // Note: we can use that route for different publish action. We should be able to use the same responder.
+	LLHTTPClient::post(getFacebookConnectURL("/share/photo"), body, new LLFacebookPostResponder());
+}
+
 void LLFacebookConnect::storeContent(const LLSD& content)
 {
     mGeneration++;
diff --git a/indra/newview/llfacebookconnect.h b/indra/newview/llfacebookconnect.h
index 8886630222..faa60b0f34 100644
--- a/indra/newview/llfacebookconnect.h
+++ b/indra/newview/llfacebookconnect.h
@@ -47,6 +47,7 @@ public:
     
     void loadFacebookFriends();
     void postCheckinMessage(const std::string& message, const std::string& link, const std::string& name, const std::string& caption, const std::string& description, const std::string& picture);
+	void sharePhoto(const std::string& image_url, const std::string& caption);
 
     void clearContent();
 	void storeContent(const LLSD& content);