diff options
Diffstat (limited to 'indra/newview/llwlhandlers.cpp')
| -rwxr-xr-x | indra/newview/llwlhandlers.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llwlhandlers.cpp b/indra/newview/llwlhandlers.cpp index ff15afa598..87e8c3008e 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) { @@ -126,7 +126,7 @@ void LLEnvironmentRequest::environmentRequestCoro(std::string url) regionId = gAgent.getRegion()->getRegionID(); } - if (result[0]["regionID"].asUUID() != regionId) + if ((result[0]["regionID"].asUUID() != regionId) && regionId.notNull()) { LL_WARNS("WindlightCaps") << "Not in the region from where this data was received (wanting " << regionId << " but got " << result[0]["regionID"].asUUID() @@ -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. /* |