diff options
author | Rider Linden <rider@lindenlab.com> | 2015-09-18 11:39:22 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2015-09-18 11:39:22 -0700 |
commit | 75c6549fde060e974c90636685962ee373f94202 (patch) | |
tree | 0c041c248d045b83ef10b561bf26dc64e3716def /indra/newview/llwlhandlers.cpp | |
parent | 2108b3e540406daf08d2845ac395ad4bb1633b35 (diff) |
Set consistent terminology for yield/wait -> suspend for coroutines.
Diffstat (limited to 'indra/newview/llwlhandlers.cpp')
-rwxr-xr-x | indra/newview/llwlhandlers.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwlhandlers.cpp b/indra/newview/llwlhandlers.cpp index ff15afa598..8ecfeef2dc 100755 --- a/indra/newview/llwlhandlers.cpp +++ b/indra/newview/llwlhandlers.cpp @@ -101,7 +101,7 @@ void LLEnvironmentRequest::environmentRequestCoro(std::string url) httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("EnvironmentRequest", httpPolicy)); LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest); - LLSD result = httpAdapter->getAndYield(httpRequest, url); + LLSD result = httpAdapter->getAndSuspend(httpRequest, url); if (requestId != LLEnvironmentRequest::sLastRequest) { @@ -185,7 +185,7 @@ void LLEnvironmentApply::environmentApplyCoro(std::string url, LLSD content) httpAdapter(new LLCoreHttpUtil::HttpCoroutineAdapter("EnvironmentApply", httpPolicy)); LLCore::HttpRequest::ptr_t httpRequest(new LLCore::HttpRequest); - LLSD result = httpAdapter->postAndYield(httpRequest, url, content); + LLSD result = httpAdapter->postAndSuspend(httpRequest, url, content); LLSD notify; // for error reporting. If there is something to report to user this will be defined. /* |