diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-07-10 16:54:05 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-07-10 16:54:05 -0400 |
commit | 9809f59fa93952d066e61223b4c6d1895a43e4dd (patch) | |
tree | cb1747a38870c85687842ee4348a81ec74309874 /indra/viewer_components | |
parent | 675b6a807435a2c36297285dc307014141dd7960 (diff) | |
parent | 6f9f89ee71751a0e88bbda91fef1a575a5a68ed9 (diff) |
Merge restore of selfless changes
Diffstat (limited to 'indra/viewer_components')
-rwxr-xr-x | indra/viewer_components/login/lllogin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/viewer_components/login/lllogin.cpp b/indra/viewer_components/login/lllogin.cpp index b8408a6fb4..abdb820bb9 100755 --- a/indra/viewer_components/login/lllogin.cpp +++ b/indra/viewer_components/login/lllogin.cpp @@ -176,7 +176,7 @@ void LLLogin::Impl::login_(LLCoros::self& self, std::string uri, LLSD login_para request["op"] = "rewriteURI"; request["uri"] = uri; request["reply"] = replyPump.getName(); - rewrittenURIs = postAndWait(self, request, srv_pump_name, filter); + rewrittenURIs = llcoro::postAndWait(request, srv_pump_name, filter); // EXP-772: If rewrittenURIs fail, try original URI as a fallback. rewrittenURIs.append(uri); } // we no longer need the filter @@ -222,10 +222,10 @@ void LLLogin::Impl::login_(LLCoros::self& self, std::string uri, LLSD login_para // returns. Subsequent responses, of course, must be awaited // without posting again. for (mAuthResponse = validateResponse(loginReplyPump.getName(), - postAndWait(self, request, xmlrpcPump, loginReplyPump, "reply")); + llcoro::postAndWait(request, xmlrpcPump, loginReplyPump, "reply")); mAuthResponse["status"].asString() == "Downloading"; mAuthResponse = validateResponse(loginReplyPump.getName(), - waitForEventOn(self, loginReplyPump))) + llcoro::waitForEventOn(loginReplyPump))) { // Still Downloading -- send progress update. sendProgressEvent("offline", "downloading"); |