summaryrefslogtreecommitdiff
path: root/indra/viewer_components/login
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2015-09-18 11:39:22 -0700
committerRider Linden <rider@lindenlab.com>2015-09-18 11:39:22 -0700
commit75c6549fde060e974c90636685962ee373f94202 (patch)
tree0c041c248d045b83ef10b561bf26dc64e3716def /indra/viewer_components/login
parent2108b3e540406daf08d2845ac395ad4bb1633b35 (diff)
Set consistent terminology for yield/wait -> suspend for coroutines.
Diffstat (limited to 'indra/viewer_components/login')
-rwxr-xr-xindra/viewer_components/login/lllogin.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/viewer_components/login/lllogin.cpp b/indra/viewer_components/login/lllogin.cpp
index 88415ff11a..1feb41faf6 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 = llcoro::postAndWait(request, srv_pump_name, filter);
+ rewrittenURIs = llcoro::postEventAndSuspend(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
@@ -215,16 +215,16 @@ void LLLogin::Impl::login_(std::string uri, LLSD login_params)
sendProgressEvent("offline", "authenticating", progress_data);
// We expect zero or more "Downloading" status events, followed by
- // exactly one event with some other status. Use postAndWait() the
+ // exactly one event with some other status. Use postEventAndSuspend() the
// first time, because -- at least in unit-test land -- it's
// possible for the reply to arrive before the post() call
// returns. Subsequent responses, of course, must be awaited
// without posting again.
for (mAuthResponse = validateResponse(loginReplyPump.getName(),
- llcoro::postAndWait(request, xmlrpcPump, loginReplyPump, "reply"));
+ llcoro::postEventAndSuspend(request, xmlrpcPump, loginReplyPump, "reply"));
mAuthResponse["status"].asString() == "Downloading";
mAuthResponse = validateResponse(loginReplyPump.getName(),
- llcoro::waitForEventOn(loginReplyPump)))
+ llcoro::suspendUntilEventOn(loginReplyPump)))
{
// Still Downloading -- send progress update.
sendProgressEvent("offline", "downloading");