diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index 8b5fb548776e9b8e59ca88150c5254ca1d8e6312..9be15d8f1dc57eff25e2d058dfc3345b827b6ea0 100755
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -173,29 +173,9 @@ 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-float")
+ if (key_in == "constants")
{
- color_group = "SyntaxLslConstantFloat";
- }
- else if (key_in == "constants-integer")
- {
- color_group = "SyntaxLslConstantInteger";
- }
- else if (key_in == "constants-key")
- {
- color_group = "SyntaxLslConstantKey";
- }
- else if (key_in == "constants-rotation")
- {
- color_group = "SyntaxLslConstantRotation";
- }
- else if (key_in == "constants-string")
- {
- color_group = "SyntaxLslConstantString";
- }
- else if (key_in == "constants-vector")
- {
- color_group = "SyntaxLslConstantVector";
+ color_group = "SyntaxLslConstant";
}
else if (key_in == "controls")
{
@@ -229,18 +209,6 @@ LLColor4 LLKeywords::getColorGroup(const std::string& key_in)
{
color_group = "SyntaxLslSection";
}
- else if (key_in == "misc-double_quotation_marks")
- {
- color_group = "SyntaxLslStringLiteral";
- }
- else if (key_in == "misc-comments_1_sided")
- {
- color_group = "SyntaxLslComment";
- }
- else if (key_in == "misc-comments_2_sided")
- {
- color_group = "SyntaxLslComment";
- }
else
{
LL_WARNS("SyntaxLSL") << "Color key '" << key_in << "' not recognized." << LL_ENDL;
@@ -265,9 +233,9 @@ void LLKeywords::processTokens()
// Add 'standard' stuff: Quotes, Comments, Strings, Labels, etc. before processing the LLSD
std::string delimiter;
addToken(LLKeywordToken::TT_LABEL, "@", getColorGroup("misc-flow-label"), "Label\nTarget for jump statement", delimiter );
- addToken(LLKeywordToken::TT_ONE_SIDED_DELIMITER, "//", getColorGroup("misc-comments_1_sided"), "Comment (single-line)\nNon-functional commentary or disabled code", delimiter );
- addToken(LLKeywordToken::TT_TWO_SIDED_DELIMITER, "/*", getColorGroup("misc-comments_2_sided"), "Comment (multi-line)\nNon-functional commentary or disabled code", "*/" );
- addToken(LLKeywordToken::TT_DOUBLE_QUOTATION_MARKS, "\"", getColorGroup("misc-double_quotation_marks"), "String literal", "\"" );
+ addToken(LLKeywordToken::TT_ONE_SIDED_DELIMITER, "//", LLUIColorTable::instance().getColor("SyntaxLslComment"), "Comment (single-line)\nNon-functional commentary or disabled code", delimiter );
+ addToken(LLKeywordToken::TT_TWO_SIDED_DELIMITER, "/*", LLUIColorTable::instance().getColor("SyntaxLslComment"), "Comment (multi-line)\nNon-functional commentary or disabled code", "*/" );
+ addToken(LLKeywordToken::TT_DOUBLE_QUOTATION_MARKS, "\"", LLUIColorTable::instance().getColor("SyntaxLslStringLiteral"), "String literal", "\"" );
LLSD::map_iterator itr = mSyntax.beginMap();
for ( ; itr != mSyntax.endMap(); ++itr)
@@ -401,7 +369,7 @@ void LLKeywords::processTokensGroup(const LLSD& tokens, const std::string& group
else if (tokens.isArray()) // Currently nothing should need this, but it's here for completeness
{
LL_INFOS("SyntaxLSL") << "Curious, shouldn't be an array here; adding all using color " << color << LL_ENDL;
- for (int count = 0; count < tokens.size(); ++count)
+ for (S32 count = 0; count < tokens.size(); ++count)
{
addToken(token_type, tokens[count], color, "");
}
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index bdbece33e0e19d527e3bb87cd7625e43d090b40f..3a1f3d4e0ae3a68160f804c83c6243ea0db8b099 100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -919,23 +919,8 @@
name="SyntaxLslComment"
value=".8 .3 .15 1.0" />
<color
- name="SyntaxLslConstantFloat"
+ name="SyntaxLslConstant"
value=".3 .1 .5 1.0" />
- <color
- name="SyntaxLslConstantInteger"
- value=".1 .1 .5 1.0" />
- <color
- name="SyntaxLslConstantKey"
- value=".1 .3 .5 1.0" />
- <color
- name="SyntaxLslConstantRotation"
- value=".2 .4 .2 1.0" />
- <color
- name="SyntaxLslConstantString"
- value=".1 .3 .5 1.0" />
- <color
- name="SyntaxLslConstantVector"
- value=".2 .4 .2 1.0" />
<color
name="SyntaxLslControlFlow"
value="0 0 .8 1.0" />
diff --git a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
index a076839c09fa1cfc5a74a75f8668309c1b63cd5c..8ae0df22b1bb96ab7e267e9438477c1f0dfa4ffd 100644
--- a/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
+++ b/indra/newview/skins/default/xui/en/floater_script_ed_prefs.xml
@@ -268,15 +268,15 @@
label_height="0"
layout="topleft"
left="170"
- name="i_constant"
+ name="constant"
top_pad="10"
width="44" >
<color_swatch.init_callback
function="ScriptPref.getUIColor"
- parameter="SyntaxLslConstantInteger" />
+ parameter="SyntaxLslConstant" />
<color_swatch.commit_callback
function="ScriptPref.applyUIColor"
- parameter="SyntaxLslConstantInteger" />
+ parameter="SyntaxLslConstant" />
</color_swatch>
<text
type="string"
@@ -286,100 +286,10 @@
layout="topleft"
left_pad="5"
mouse_opaque="false"
- name="i_constant_label"
+ name="constant_label"
top_delta="5"
width="100">
- Integer Const
- </text>
- <color_swatch
- can_apply_immediately="true"
- follows="left|top"
- height="24"
- label_height="0"
- layout="topleft"
- left="170"
- name="s_constant"
- top_pad="10"
- width="44" >
- <color_swatch.init_callback
- function="ScriptPref.getUIColor"
- parameter="SyntaxLslConstantString" />
- <color_swatch.commit_callback
- function="ScriptPref.applyUIColor"
- parameter="SyntaxLslConstantString" />
- </color_swatch>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_pad="5"
- mouse_opaque="false"
- name="s_constant_label"
- top_delta="5"
- width="100">
- String Const
- </text>
- <color_swatch
- can_apply_immediately="true"
- follows="left|top"
- height="24"
- label_height="0"
- layout="topleft"
- left="170"
- name="f_constant"
- top_pad="10"
- width="44" >
- <color_swatch.init_callback
- function="ScriptPref.getUIColor"
- parameter="SyntaxLslConstantFloat" />
- <color_swatch.commit_callback
- function="ScriptPref.applyUIColor"
- parameter="SyntaxLslConstantFloat" />
- </color_swatch>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_pad="5"
- mouse_opaque="false"
- name="f_constant_label"
- top_delta="5"
- width="100">
- Float Const
- </text>
- <color_swatch
- can_apply_immediately="true"
- follows="left|top"
- height="24"
- label_height="0"
- layout="topleft"
- left="170"
- name="c_constant"
- top_pad="10"
- width="44" >
- <color_swatch.init_callback
- function="ScriptPref.getUIColor"
- parameter="SyntaxCompoundConstant" />
- <color_swatch.commit_callback
- function="ScriptPref.applyUIColor"
- parameter="SyntaxCompoundConstant" />
- </color_swatch>
- <text
- type="string"
- length="1"
- follows="left|top"
- height="10"
- layout="topleft"
- left_pad="5"
- mouse_opaque="false"
- name="c_constant_label"
- top_delta="5"
- width="100">
- Compound
+ Constant
</text>
<color_swatch
can_apply_immediately="true"