diff options
| author | simon <none@none> | 2015-09-10 13:55:27 -0700 |
|---|---|---|
| committer | simon <none@none> | 2015-09-10 13:55:27 -0700 |
| commit | 0466ba380f11b30319f9dffd7e833f314829a12c (patch) | |
| tree | dfa0be3f1ec0541a9d32f366d1d21935d270aa72 /indra/llui | |
| parent | 744c1453ed595681cb30badfdd2cfc0bb4c6ccb3 (diff) | |
MAINT-5619 : Viewer seems to parse LSL syntax file three times, has warnings
Diffstat (limited to 'indra/llui')
| -rwxr-xr-x | indra/llui/llkeywords.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp index 6750ee482a..fc4a007d9e 100755 --- a/indra/llui/llkeywords.cpp +++ b/indra/llui/llkeywords.cpp @@ -296,7 +296,7 @@ void LLKeywords::processTokensGroup(const LLSD& tokens, const std::string& group } color_group = getColorGroup(group); - LL_INFOS("SyntaxLSL") << "Group: '" << group << "', using color: '" << color_group << "'" << LL_ENDL; + LL_DEBUGS("SyntaxLSL") << "Group: '" << group << "', using color: '" << color_group << "'" << LL_ENDL; if (tokens.isMap()) { @@ -331,7 +331,14 @@ void LLKeywords::processTokensGroup(const LLSD& tokens, const std::string& group switch (token_type) { case LLKeywordToken::TT_CONSTANT: - color_group = getColorGroup(group + "-" + getAttribute("type")); + if (getAttribute("type").length() > 0) + { + color_group = getColorGroup(group + "-" + getAttribute("type")); + } + else + { + color_group = getColorGroup(group); + } tooltip = "Type: " + getAttribute("type") + ", Value: " + getAttribute("value"); break; case LLKeywordToken::TT_EVENT: |