summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xindra/llui/llkeywords.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index c5e8f76a73..6a349f3916 100755
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -197,7 +197,7 @@ LLColor4 LLKeywords::getColorGroup(const std::string key_in)
{
ColourGroup = "SyntaxLslConstantKey";
}
- else if (key_in == "constants-string")
+ else if (key_in == "constants-rotation")
{
ColourGroup = "SyntaxLslConstantRotation";
}
@@ -249,6 +249,10 @@ LLColor4 LLKeywords::getColorGroup(const std::string key_in)
{
ColourGroup = "SyntaxLslComment2Sided";
}
+ else
+ {
+ LL_WARNS("SyntaxLSL") << "Color key '" << key_in << "' not recognised!" << LL_ENDL;
+ }
return LLUIColorTable::instance().getColor(ColourGroup);
}
@@ -334,7 +338,6 @@ void LLKeywords::processTokensGroup(LLSD& Tokens, const std::string Group)
{
if (outerIt->second.isMap())
{
- Color = ColorGroup;
mAttributes.clear();
LLSD arguments = LLSD ();
LLSD::map_iterator innerIt = outerIt->second.beginMap();
@@ -360,7 +363,7 @@ void LLKeywords::processTokensGroup(LLSD& Tokens, const std::string Group)
std::string tooltip = "";
if (token_type == LLKeywordToken::TT_CONSTANT)
{
- Color = getColorGroup(Group + "-" + getAttribute("type"));
+ ColorGroup = getColorGroup(Group + "-" + getAttribute("type"));
tooltip = "Type: " + getAttribute("type") + ", Value: " + getAttribute("value");
}
else if (token_type == LLKeywordToken::TT_EVENT)