diff options
author | Rider Linden <rider@lindenlab.com> | 2015-07-07 19:41:27 +0100 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2015-07-07 19:41:27 +0100 |
commit | 247eb0c9c3418c10be8f2a0e3c8116758efa702f (patch) | |
tree | d3a448c69f1ad241dc72662970d702c2aa618382 /indra/newview/llflickrconnect.h | |
parent | d785ec312bb7f4e77517eb44f46f276ba0129677 (diff) |
Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5
Diffstat (limited to 'indra/newview/llflickrconnect.h')
-rw-r--r-- | indra/newview/llflickrconnect.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llflickrconnect.h b/indra/newview/llflickrconnect.h index 0155804da0..26c63f8b08 100644 --- a/indra/newview/llflickrconnect.h +++ b/indra/newview/llflickrconnect.h @@ -97,12 +97,12 @@ private: static boost::scoped_ptr<LLEventPump> sContentWatcher; bool testShareStatus(LLSD &result); - void flickrConnectCoro(std::string requestToken, std::string oauthVerifier); - void flickrShareCoro(LLSD share); - void flickrShareImageCoro(LLPointer<LLImageFormatted> image, std::string title, std::string description, std::string tags, int safetyLevel); - void flickrDisconnectCoro(); - void flickrConnectedCoro(bool autoConnect); - void flickrInfoCoro(); + void flickrConnectCoro(LLCoros::self& self, std::string requestToken, std::string oauthVerifier); + void flickrShareCoro(LLCoros::self& self, LLSD share); + void flickrShareImageCoro(LLCoros::self& self, LLPointer<LLImageFormatted> image, std::string title, std::string description, std::string tags, int safetyLevel); + void flickrDisconnectCoro(LLCoros::self& self); + void flickrConnectedCoro(LLCoros::self& self, bool autoConnect); + void flickrInfoCoro(LLCoros::self& self); }; |