diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-09-16 15:04:57 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-09-16 15:04:57 -0700 |
| commit | c7d5a4bab75b651b65e173a17079438f03695cc1 (patch) | |
| tree | a4e8046e2232a4907a37eba0e95cca54b1a37a04 /indra/newview/llflickrconnect.cpp | |
| parent | fd27f0feb8ba4a2a8ac2b2c3b71bf71ab56aa42e (diff) | |
MAINT-5628: Set flicr state to "Posting" on all paths before image upload starts. Causes "Upload" button to be disabled and activity indicator to appear. Also made sure that setConnectionState is called correctly for Facebook and Twitter.
Diffstat (limited to 'indra/newview/llflickrconnect.cpp')
| -rw-r--r-- | indra/newview/llflickrconnect.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llflickrconnect.cpp b/indra/newview/llflickrconnect.cpp index 83e4f19191..b18149a06c 100644 --- a/indra/newview/llflickrconnect.cpp +++ b/indra/newview/llflickrconnect.cpp @@ -168,8 +168,6 @@ void LLFlickrConnect::flickrShareCoro(LLSD share) httpOpts->setWantHeaders(true); httpOpts->setFollowRedirects(false); - setConnectionState(LLFlickrConnect::FLICKR_POSTING); - LLSD result = httpAdapter->postAndYield(httpRequest, getFlickrConnectURL("/share/photo", true), share, httpOpts); if (testShareStatus(result)) @@ -471,12 +469,15 @@ void LLFlickrConnect::uploadPhoto(const std::string& image_url, const std::strin body["tags"] = tags; body["safety_level"] = safety_level; + setConnectionState(LLFlickrConnect::FLICKR_POSTING); + LLCoros::instance().launch("LLFlickrConnect::flickrShareCoro", boost::bind(&LLFlickrConnect::flickrShareCoro, this, body)); } void LLFlickrConnect::uploadPhoto(LLPointer<LLImageFormatted> image, const std::string& title, const std::string& description, const std::string& tags, int safety_level) { + setConnectionState(LLFlickrConnect::FLICKR_POSTING); LLCoros::instance().launch("LLFlickrConnect::flickrShareImageCoro", boost::bind(&LLFlickrConnect::flickrShareImageCoro, this, image, |