Skip to content
Snippets Groups Projects
Commit e3a27586 authored by Cinder's avatar Cinder
Browse files

STORM-2037 - Update fetchKeywordsFileresponder to use latest LLHTTPClient::responder changes

parent 226929f8
No related branches found
No related tags found
No related merge requests found
...@@ -323,6 +323,7 @@ Cinder Roxley ...@@ -323,6 +323,7 @@ Cinder Roxley
STORM-1951 STORM-1951
STORM-2035 STORM-2035
STORM-2036 STORM-2036
STORM-2037
Clara Young Clara Young
Coaldust Numbers Coaldust Numbers
VWR-1095 VWR-1095
......
...@@ -47,23 +47,22 @@ class fetchKeywordsFileResponder : public LLHTTPClient::Responder ...@@ -47,23 +47,22 @@ class fetchKeywordsFileResponder : public LLHTTPClient::Responder
LL_DEBUGS("SyntaxLSL") << "Instantiating with file saving to: '" << filespec << "'" << LL_ENDL; LL_DEBUGS("SyntaxLSL") << "Instantiating with file saving to: '" << filespec << "'" << LL_ENDL;
} }
virtual void errorWithContent(U32 status, /* virtual */ void httpFailure()
const std::string& reason,
const LLSD& content)
{ {
LL_WARNS("SyntaxLSL") << "failed to fetch syntax file [status:" << status << "]: " << content << LL_ENDL; LL_WARNS("SyntaxLSL") << "failed to fetch syntax file [status:" << getStatus() << "]: " << getContent() << LL_ENDL;
} }
virtual void result(const LLSD& content_ref) /* virtual */ void httpSuccess()
{ {
// Continue only if a valid LLSD object was returned. // Continue only if a valid LLSD object was returned.
if (content_ref.isMap()) const LLSD& content = getContent();
if (content.isMap())
{ {
if (LLSyntaxIdLSL::getInstance()->isSupportedVersion(content_ref)) if (LLSyntaxIdLSL::getInstance()->isSupportedVersion(content))
{ {
LLSyntaxIdLSL::getInstance()->setKeywordsXml(content_ref); LLSyntaxIdLSL::getInstance()->setKeywordsXml(content);
cacheFile(content_ref); cacheFile(content);
LLSyntaxIdLSL::getInstance()->handleFileFetched(mFileSpec); LLSyntaxIdLSL::getInstance()->handleFileFetched(mFileSpec);
} }
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment