summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-06-04 18:39:56 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2013-06-04 18:39:56 -0700
commitf023925d31a8b2cd5514e68815fa0b04790b7046 (patch)
treeb6c29fa6f4daf65be2499e27c2e420d6d84d7fda
parentabcb3e85628712da4d61fda6e68bb86a29e1f965 (diff)
parentf3a72799b01ad2449ae24e86169b994c696c1b4a (diff)
merge
-rwxr-xr-xindra/newview/llpanelsnapshotfacebook.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llpanelsnapshotfacebook.cpp b/indra/newview/llpanelsnapshotfacebook.cpp
index 50c5b62fe7..200c64f16b 100755
--- a/indra/newview/llpanelsnapshotfacebook.cpp
+++ b/indra/newview/llpanelsnapshotfacebook.cpp
@@ -38,6 +38,8 @@
#include "llsidetraypanelcontainer.h"
#include "llwebprofile.h"
+#include "llfacebookconnect.h"
+
/**
* Posts a snapshot to the resident Facebook account.
*/
@@ -98,4 +100,7 @@ void LLPanelSnapshotFacebook::onSend()
LLWebProfile::uploadImage(LLFloaterSnapshot::getImageData(), caption, add_location);
LLFloaterSnapshot::postSave();
+
+ // test with a placeholder image, until we can figure out a way to grab the uploaded image url
+ LLFacebookConnect::instance().sharePhoto("http://fc02.deviantart.net/fs43/i/2009/125/a/9/Future_of_Frog_by_axcho.jpg", caption);
}