livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for STORM-2037

meow-7.2.2
Oz Linden 2014-07-16 13:46:47 -04:00
parent 4cba2c4457 e3a27586f1
commit 2b731d5f06
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -323,6 +323,7 @@ Cinder Roxley
STORM-1951
STORM-2035
STORM-2036
STORM-2037
Clara Young
Coaldust Numbers
VWR-1095

17
indra/newview/llsyntaxid.cpp
View File

@ -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