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)
{
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 464e633297..bdc884885f 100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -917,32 +917,32 @@
reference="Black" />
+ value="0 0.5 0 1" />
+ value="0 0.6 0.6 1" />
+ value="0.4 0 0.8 1" />
+ value="0 0 0.8 1" />
+ value="0.8 0.4 0 1" />
+ value="0.9 0.0 0.66, 1" />
+ value="0 0.3 0.5 1" />
+ value="0.3 0 0.5 1" />
+ value="0.7 .2 .35 1" />
+ value="1 0.14 0 1" />