summaryrefslogtreecommitdiff
path: root/indra/newview/llsyntaxid.cpp
diff options
context:
space:
mode:
authorCinder <cinder.roxley@phoenixviewer.com>2014-06-09 16:19:20 -0600
committerCinder <cinder.roxley@phoenixviewer.com>2014-06-09 16:19:20 -0600
commit78be5c3aa5f7263698bec5bcbccb24c150f78d09 (patch)
tree2d6b115a392ce2bc7a8e5ef6bf1a5e4e8487515a /indra/newview/llsyntaxid.cpp
parent41f6c5ce4899b3ae57aefa564ee22ff84fa698ce (diff)
STORM-2026 - Use more unique syntax colors by default, also clean up some indentation
Diffstat (limited to 'indra/newview/llsyntaxid.cpp')
-rw-r--r--indra/newview/llsyntaxid.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp
index 5b5bab85d0..236ad784ec 100644
--- a/indra/newview/llsyntaxid.cpp
+++ b/indra/newview/llsyntaxid.cpp
@@ -51,31 +51,31 @@ public:
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:" << status << "]: " << content << LL_ENDL;
}
virtual void result(const LLSD& content_ref)
{
- // Continue only if a valid LLSD object was returned.
- if (content_ref.isMap())
- {
- if (LLSyntaxIdLSL::getInstance()->isSupportedVersion(content_ref))
+ // Continue only if a valid LLSD object was returned.
+ if (content_ref.isMap())
{
- LLSyntaxIdLSL::getInstance()->setKeywordsXml(content_ref);
+ if (LLSyntaxIdLSL::getInstance()->isSupportedVersion(content_ref))
+ {
+ LLSyntaxIdLSL::getInstance()->setKeywordsXml(content_ref);
- cacheFile(content_ref);
- LLSyntaxIdLSL::getInstance()->handleFileFetched(mFileSpec);
+ cacheFile(content_ref);
+ LLSyntaxIdLSL::getInstance()->handleFileFetched(mFileSpec);
+ }
+ else
+ {
+ LL_WARNS("SyntaxLSL") << "Unknown or unsupported version of syntax file." << LL_ENDL;
+ }
}
else
{
- LL_WARNS("SyntaxLSL") << "Unknown or unsupported version of syntax file." << LL_ENDL;
+ LL_WARNS("SyntaxLSL") << "Syntax file '" << mFileSpec << "' contains invalid LLSD." << LL_ENDL;
}
}
- else
- {
- LL_WARNS("SyntaxLSL") << "Syntax file '" << mFileSpec << "' contains invalid LLSD." << LL_ENDL;
- }
-}
void cacheFile(const LLSD& content_ref)
{