summaryrefslogtreecommitdiff
path: root/indra/newview/llwlhandlers.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2015-05-11 16:52:02 -0700
committerRider Linden <rider@lindenlab.com>2015-05-11 16:52:02 -0700
commit3e004ce66e1fa07421c138a20eb0dba61c5b26b3 (patch)
treedaad89b766f9f3db7c10880df5e841900039c212 /indra/newview/llwlhandlers.cpp
parent6cba35d3c0a07843fe1254448fc122ecd3854424 (diff)
Updated feature manager downloader to coroutine.
Added "raw" coroutine handler (returns raw result as LLSD::Binary) and split out the guts of the get, put, etc methods. Moved getStatusFromLLSD from HttpCoroHandler into HttpCorutineAdapter
Diffstat (limited to 'indra/newview/llwlhandlers.cpp')
-rwxr-xr-xindra/newview/llwlhandlers.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwlhandlers.cpp b/indra/newview/llwlhandlers.cpp
index c05486b173..3145c3f38d 100755
--- a/indra/newview/llwlhandlers.cpp
+++ b/indra/newview/llwlhandlers.cpp
@@ -110,7 +110,7 @@ void LLEnvironmentRequest::environmentRequestCoro(LLCoros::self& self, std::stri
}
LLSD httpResults = result["http_result"];
- LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroHandler::getStatusFromLLSD(httpResults);
+ LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
if (!status)
{
LL_WARNS("WindlightCaps") << "Got an error, not using region windlight... " << LL_ENDL;
@@ -207,7 +207,7 @@ void LLEnvironmentApply::environmentApplyCoro(LLCoros::self& self, std::string u
{ // Breaks from loop in the case of an error.
LLSD httpResults = result["http_result"];
- LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroHandler::getStatusFromLLSD(httpResults);
+ LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
if (!status)
{
LL_WARNS("WindlightCaps") << "Couldn't apply windlight settings to region! " << LL_ENDL;