1 files changed, 19 insertions, 13 deletions

diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp
index 136e02953c..1de4102dba 100755
--- a/indra/newview/llfacebookconnect.cpp
+++ b/indra/newview/llfacebookconnect.cpp
@@ -165,9 +165,7 @@ void LLFacebookConnect::facebookConnectCoro(std::string authCode, std::string au
     httpOpts->setWantHeaders(true);
     httpOpts->setFollowRedirects(false);
 
-    setConnectionState(LLFacebookConnect::FB_CONNECTION_IN_PROGRESS);
-
-    LLSD result = httpAdapter->putAndYield(httpRequest, getFacebookConnectURL("/connection"), putData, httpOpts, get_headers());
+    LLSD result = httpAdapter->putAndSuspend(httpRequest, getFacebookConnectURL("/connection"), putData, httpOpts, get_headers());
 
     LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
     LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
@@ -242,9 +240,7 @@ void LLFacebookConnect::facebookShareCoro(std::string route, LLSD share)
     httpOpts->setWantHeaders(true);
     httpOpts->setFollowRedirects(false);
 
-    setConnectionState(LLFacebookConnect::FB_POSTING);
-
-    LLSD result = httpAdapter->postAndYield(httpRequest, getFacebookConnectURL(route, true), share, httpOpts, get_headers());
+    LLSD result = httpAdapter->postAndSuspend(httpRequest, getFacebookConnectURL(route, true), share, httpOpts, get_headers());
 
     if (testShareStatus(result))
     {
@@ -311,7 +307,7 @@ void LLFacebookConnect::facebookShareImageCoro(std::string route, LLPointer<LLIm
 
     setConnectionState(LLFacebookConnect::FB_POSTING);
 
-    LLSD result = httpAdapter->postAndYield(httpRequest, getFacebookConnectURL(route, true), raw, httpOpts, httpHeaders);
+    LLSD result = httpAdapter->postAndSuspend(httpRequest, getFacebookConnectURL(route, true), raw, httpOpts, httpHeaders);
 
     if (testShareStatus(result))
     {
@@ -331,10 +327,9 @@ void LLFacebookConnect::facebookDisconnectCoro()
     LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest);
     LLCore::HttpOptions::ptr_t httpOpts(new LLCore::HttpOptions);
 
-    setConnectionState(LLFacebookConnect::FB_DISCONNECTING);
     httpOpts->setFollowRedirects(false);
 
-    LLSD result = httpAdapter->deleteAndYield(httpRequest, getFacebookConnectURL("/connection"), httpOpts, get_headers());
+    LLSD result = httpAdapter->deleteAndSuspend(httpRequest, getFacebookConnectURL("/connection"), httpOpts, get_headers());
 
     LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
     LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
@@ -370,7 +365,7 @@ void LLFacebookConnect::facebookConnectedCheckCoro(bool autoConnect)
 
     httpOpts->setFollowRedirects(false);
 
-    LLSD result = httpAdapter->getAndYield(httpRequest, getFacebookConnectURL("/connection", true), httpOpts, get_headers());
+    LLSD result = httpAdapter->getAndSuspend(httpRequest, getFacebookConnectURL("/connection", true), httpOpts, get_headers());
 
     LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
     LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
@@ -418,7 +413,7 @@ void LLFacebookConnect::facebookConnectInfoCoro()
     httpOpts->setWantHeaders(true);
     httpOpts->setFollowRedirects(false);
 
-    LLSD result = httpAdapter->getAndYield(httpRequest, getFacebookConnectURL("/info", true), httpOpts, get_headers());
+    LLSD result = httpAdapter->getAndSuspend(httpRequest, getFacebookConnectURL("/info", true), httpOpts, get_headers());
 
     LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
     LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
@@ -461,7 +456,7 @@ void LLFacebookConnect::facebookConnectFriendsCoro()
 
     httpOpts->setFollowRedirects(false);
 
-    LLSD result = httpAdapter->getAndYield(httpRequest, getFacebookConnectURL("/friends", true), httpOpts, get_headers());
+    LLSD result = httpAdapter->getAndSuspend(httpRequest, getFacebookConnectURL("/friends", true), httpOpts, get_headers());
 
     LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
     LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
@@ -546,6 +541,8 @@ std::string LLFacebookConnect::getFacebookConnectURL(const std::string& route, b
 
 void LLFacebookConnect::connectToFacebook(const std::string& auth_code, const std::string& auth_state)
 {
+    setConnectionState(LLFacebookConnect::FB_CONNECTION_IN_PROGRESS);
+
     LLCoros::instance().launch("LLFacebookConnect::facebookConnectCoro",
         boost::bind(&LLFacebookConnect::facebookConnectCoro, this, auth_code, auth_state));
 }
@@ -558,6 +555,8 @@ void LLFacebookConnect::disconnectFromFacebook()
 
 void LLFacebookConnect::checkConnectionToFacebook(bool auto_connect)
 {
+    setConnectionState(LLFacebookConnect::FB_DISCONNECTING);
+
     LLCoros::instance().launch("LLFacebookConnect::facebookConnectedCheckCoro",
         boost::bind(&LLFacebookConnect::facebookConnectedCheckCoro, this, auto_connect));
 }
@@ -583,6 +582,8 @@ void LLFacebookConnect::loadFacebookFriends()
 void LLFacebookConnect::postCheckin(const std::string& location, const std::string& name, 
     const std::string& description, const std::string& image, const std::string& message)
 {
+    setConnectionState(LLFacebookConnect::FB_POSTING);
+
 	LLSD body;
 	if (!location.empty())
     {
@@ -611,7 +612,8 @@ void LLFacebookConnect::postCheckin(const std::string& location, const std::stri
 
 void LLFacebookConnect::sharePhoto(const std::string& image_url, const std::string& caption)
 {
-    // *TODO: I could not find an instace where this method is used.  Remove?
+    setConnectionState(LLFacebookConnect::FB_POSTING);
+
 	LLSD body;
 	body["image"] = image_url;
 	body["caption"] = caption;
@@ -622,6 +624,8 @@ void LLFacebookConnect::sharePhoto(const std::string& image_url, const std::stri
 
 void LLFacebookConnect::sharePhoto(LLPointer<LLImageFormatted> image, const std::string& caption)
 {
+    setConnectionState(LLFacebookConnect::FB_POSTING);
+
     LLCoros::instance().launch("LLFacebookConnect::facebookShareImageCoro",
         boost::bind(&LLFacebookConnect::facebookShareImageCoro, this, "/share/photo", image, caption));
 }
@@ -631,6 +635,8 @@ void LLFacebookConnect::updateStatus(const std::string& message)
 	LLSD body;
 	body["message"] = message;
 
+    setConnectionState(LLFacebookConnect::FB_POSTING);
+
     LLCoros::instance().launch("LLFacebookConnect::facebookShareCoro",
         boost::bind(&LLFacebookConnect::facebookShareCoro, this, "/share/wall", body));
 }