diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-06-05 21:29:12 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-06-05 21:29:12 -0700 |
| commit | 3680f0332fa0e7262315d52fbd204beb2ecbc782 (patch) | |
| tree | b70984a4ca5f146715bf901ec6bb5b57b6fbd051 /indra/newview/llwebprofile.h | |
| parent | ba90e388855f99ec5b3f1991f2437f616a5d9e62 (diff) | |
| parent | 13c61d13eadaa1dab6a98385421aa56f4ba362b0 (diff) | |
Pull merge from viewer-fbc
Diffstat (limited to 'indra/newview/llwebprofile.h')
| -rwxr-xr-x | indra/newview/llwebprofile.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llwebprofile.h b/indra/newview/llwebprofile.h index 10279bffac..63dccf80af 100755 --- a/indra/newview/llwebprofile.h +++ b/indra/newview/llwebprofile.h @@ -48,8 +48,9 @@ class LLWebProfile public: typedef boost::function<void(bool ok)> status_callback_t; + typedef boost::function<void(const std::string& image_url)> image_url_callback_t; - static void uploadImage(LLPointer<LLImageFormatted> image, const std::string& caption, bool add_location); + static void uploadImage(LLPointer<LLImageFormatted> image, const std::string& caption, bool add_location, image_url_callback_t cb = image_url_callback_t()); static void setAuthCookie(const std::string& cookie); static void setImageUploadResultCallback(status_callback_t cb) { mStatusCallback = cb; } @@ -58,7 +59,7 @@ private: friend class LLWebProfileResponders::PostImageResponder; friend class LLWebProfileResponders::PostImageRedirectResponder; - static void post(LLPointer<LLImageFormatted> image, const LLSD& config, const std::string& url); + static void post(LLPointer<LLImageFormatted> image, const LLSD& config, const std::string& url, image_url_callback_t cb); static void reportImageUploadStatus(bool ok); static std::string getAuthCookie(); |