summaryrefslogtreecommitdiff
path: root/indra/viewer_components/login
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-07-10 16:47:07 -0400
committerNat Goodspeed <nat@lindenlab.com>2015-07-10 16:47:07 -0400
commit6f9f89ee71751a0e88bbda91fef1a575a5a68ed9 (patch)
tree247365c2de7ccd0bc70a39b6a70112ac881988c5 /indra/viewer_components/login
parent4c1d47d4ae231c1141c6ecf707c033563c99382a (diff)
Backed out changeset 6e1fa9518747: reapply 'selfless' changes
Diffstat (limited to 'indra/viewer_components/login')
-rwxr-xr-xindra/viewer_components/login/lllogin.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/viewer_components/login/lllogin.cpp b/indra/viewer_components/login/lllogin.cpp
index 0569e9f3e8..88415ff11a 100755
--- a/indra/viewer_components/login/lllogin.cpp
+++ b/indra/viewer_components/login/lllogin.cpp
@@ -175,7 +175,7 @@ void LLLogin::Impl::login_(std::string uri, LLSD login_params)
request["op"] = "rewriteURI";
request["uri"] = uri;
request["reply"] = replyPump.getName();
- rewrittenURIs = postAndWait(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
@@ -221,10 +221,10 @@ void LLLogin::Impl::login_(std::string uri, LLSD login_params)
// returns. Subsequent responses, of course, must be awaited
// without posting again.
for (mAuthResponse = validateResponse(loginReplyPump.getName(),
- postAndWait(request, xmlrpcPump, loginReplyPump, "reply"));
+ llcoro::postAndWait(request, xmlrpcPump, loginReplyPump, "reply"));
mAuthResponse["status"].asString() == "Downloading";
mAuthResponse = validateResponse(loginReplyPump.getName(),
- waitForEventOn(loginReplyPump)))
+ llcoro::waitForEventOn(loginReplyPump)))
{
// Still Downloading -- send progress update.
sendProgressEvent("offline", "downloading");