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

Don't hardcode black as the default color for syntax

master
Cinder 2014-05-28 12:15:37 -06:00
parent f697eb375e
commit ec2b00c2e5
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/llkeywords.cpp
View File

@ -172,7 +172,7 @@ std::string LLKeywords::getAttribute(const std::string& key)
LLColor4 LLKeywords::getColorGroup(const std::string& key_in)
{
std::string color_group = "Black";
std::string color_group = "ScriptText";
if (key_in == "constants-float")
{
color_group = "SyntaxLslConstantFloat";
@ -239,7 +239,7 @@ LLColor4 LLKeywords::getColorGroup(const std::string& key_in)
}
else
{
LL_WARNS("SyntaxLSL") << "Color key '" << key_in << "' not recognized!" << LL_ENDL;
LL_WARNS("SyntaxLSL") << "Color key '" << key_in << "' not recognized." << LL_ENDL;
}
return LLUIColorTable::instance().getColor(color_group);

1
indra/newview/llfloaterscriptedprefs.cpp
View File

@ -54,7 +54,6 @@ BOOL LLFloaterScriptEdPrefs::postBuild()
void LLFloaterScriptEdPrefs::applyUIColor(LLUICtrl* ctrl, const LLSD& param)
{
LLUIColorTable::instance().setColor(param.asString(), LLColor4(ctrl->getValue()));
// *TODO: Signal all active script editors to change colors on the fly.
mEditor->initKeywords();
mEditor->loadKeywords();
}