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

STORM-2026 - Use more unique syntax colors by default, also clean up some indentation

master
Cinder 2014-06-09 16:19:20 -06:00
parent 41f6c5ce48
commit 78be5c3aa5
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
indra/newview/llsyntaxid.cpp
View File

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

20
indra/newview/skins/default/colors.xml
View File

@ -917,32 +917,32 @@
reference="Black" />
<color
name="SyntaxLslComment"
value=".8 .3 .15 1.0" />
value="0 0.5 0 1" />
<color
name="SyntaxLslConstant"
value=".3 .1 .5 1.0" />
value="0 0.6 0.6 1" />
<color
name="SyntaxLslControlFlow"
value="0 0 .8 1.0" />
value="0.4 0 0.8 1" />
<color
name="SyntaxLslControlLabel"
value="0 0 .8 1.0" />
value="0 0 0.8 1" />
<color
name="SyntaxLslDataType"
value=".1 .3 .1 1.0" />
value="0.8 0.4 0 1" />
<color
name="SyntaxLslDeprecated"
value="0.9 0.0 0.66, 1.0" />
value="0.9 0.0 0.66, 1" />
<color
name="SyntaxLslEvent"
value="0 .3 .5 1.0" />
value="0 0.3 0.5 1" />
<color
name="SyntaxLslFunction"
value=".3 0 .5 1.0" />
value="0.3 0 0.5 1" />
<color
name="SyntaxLslGodMode"
value="0.7 .2 .35 1.0" />
value="0.7 .2 .35 1" />
<color
name="SyntaxLslStringLiteral"
value="0 .2 0 1.0" />
value="1 0.14 0 1" />
</colors>