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

Fix lsl constant highlighting and sort the if-else chain to parse a little quicker

master
Cinder 2014-06-08 18:28:10 -06:00
parent 6a6508f0fd
commit b06e63aced
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
indra/llui/llkeywords.cpp
View File

@ -173,14 +173,22 @@ std::string LLKeywords::getAttribute(const std::string& key)
LLColor4 LLKeywords::getColorGroup(const std::string& key_in)
{
std::string color_group = "ScriptText";
if (key_in == "constants")
if (key_in == "functions")
{
color_group = "SyntaxLslConstant";
color_group = "SyntaxLslFunction";
}
else if (key_in == "controls")
{
color_group = "SyntaxLslControlFlow";
}
else if (key_in == "events")
{
color_group = "SyntaxLslEvent";
}
else if (key_in == "types")
{
color_group = "SyntaxLslDataType";
}
else if (key_in == "misc-flow-label")
{
color_group = "SyntaxLslControlFlow";
@ -189,21 +197,19 @@ LLColor4 LLKeywords::getColorGroup(const std::string& key_in)
{
color_group = "SyntaxLslDeprecated";
}
else if (key_in == "events")
{
color_group = "SyntaxLslEvent";
}
else if (key_in == "functions")
{
color_group = "SyntaxLslFunction";
}
else if (key_in =="god-mode")
{
color_group = "SyntaxLslGodMode";
}
else if (key_in == "types")
else if (key_in == "constants"
|| key_in == "constants-integer"
|| key_in == "constants-float"
|| key_in == "constants-string"
|| key_in == "constants-key"
|| key_in == "constants-rotation"
|| key_in == "constants-vector")
{
color_group = "SyntaxLslDataType";
color_group = "SyntaxLslConstant";
}
else
{