From ec2b00c2e5fccd7432ef1b5a5ab5c88d098e95f2 Mon Sep 17 00:00:00 2001 From: Cinder Date: Wed, 28 May 2014 12:15:37 -0600 Subject: Don't hardcode black as the default color for syntax --- indra/llui/llkeywords.cpp | 4 ++-- indra/newview/llfloaterscriptedprefs.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp index b4e3ccbf5e..29b9c5c2f1 100755 --- a/indra/llui/llkeywords.cpp +++ b/indra/llui/llkeywords.cpp @@ -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); diff --git a/indra/newview/llfloaterscriptedprefs.cpp b/indra/newview/llfloaterscriptedprefs.cpp index da075aa36c..2484a08626 100644 --- a/indra/newview/llfloaterscriptedprefs.cpp +++ b/indra/newview/llfloaterscriptedprefs.cpp @@ -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(); } -- cgit v1.2.3