summaryrefslogtreecommitdiff
path: root/indra/newview/llflickrconnect.h
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2015-07-02 09:22:05 -0700
committerRider Linden <rider@lindenlab.com>2015-07-02 09:22:05 -0700
commitd785ec312bb7f4e77517eb44f46f276ba0129677 (patch)
tree9686020c06681328d7150ef6a89d975bd2d418ce /indra/newview/llflickrconnect.h
parentf8a7eda55bdd34eeb2fafed21d23d26cd25f924d (diff)
parent2a29dbc48295ad24a8a7137a10b9d891debea978 (diff)
Merge
Diffstat (limited to 'indra/newview/llflickrconnect.h')
-rw-r--r--indra/newview/llflickrconnect.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llflickrconnect.h b/indra/newview/llflickrconnect.h
index 26c63f8b08..0155804da0 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(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);
+ 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();
};