diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-07-16 13:46:47 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-07-16 13:46:47 -0400 |
| commit | 2b731d5f062c4973df5eca82230491a77c3b191f (patch) | |
| tree | 5900bf12ae5ac19e2722a3a3e6628c160387933e | |
| parent | 4cba2c4457609d426a5db0511776bf5db2014256 (diff) | |
| parent | e3a27586f15ba008c82ca7a64998598dc36b43d3 (diff) | |
merge changes for STORM-2037
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llsyntaxid.cpp | 17 |
2 files changed, 9 insertions, 9 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 0a1c673daf..820fe64853 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -323,6 +323,7 @@ Cinder Roxley STORM-1951 STORM-2035 STORM-2036 + STORM-2037 Clara Young Coaldust Numbers VWR-1095 diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp index b1194dcd1b..a763d42a8d 100644 --- a/indra/newview/llsyntaxid.cpp +++ b/indra/newview/llsyntaxid.cpp @@ -47,23 +47,22 @@ public: LL_DEBUGS("SyntaxLSL") << "Instantiating with file saving to: '" << filespec << "'" << LL_ENDL; } - virtual void errorWithContent(U32 status, - const std::string& reason, - const LLSD& content) + /* virtual */ void httpFailure() { - 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. - 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); } else |