summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIma Mechanique <ima.mechanique@secondlife.com>2013-11-22 01:01:29 +0000
committerIma Mechanique <ima.mechanique@secondlife.com>2013-11-22 01:01:29 +0000
commit7563fb0b5181fa7223cb08f79e2710f9d44aded3 (patch)
treeac78f8b5d24bd0d07dd7a409ada458b3f4419050
parent380334956c6689c2091e95969a7f79a29db49a4d (diff)
storm-1831 Replacing old hack with an ENUM check.
-rwxr-xr-xindra/newview/llpreviewscript.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 362836b5b9..41c172e629 100755
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -421,7 +421,6 @@ void LLScriptEdCore::onRegionChangeInitialiseKeywords()
mSyntaxIdLSL.initialise();
mEditor->mKeywords.initialise(mSyntaxIdLSL.getKeywordsXML());
- LLColor3 color(0.5f, 0.0f, 0.15f);
mEditor->loadKeywords();
std::vector<std::string> primary_keywords;
@@ -431,8 +430,7 @@ void LLScriptEdCore::onRegionChangeInitialiseKeywords()
for (token_it = mEditor->keywordsBegin(); token_it != mEditor->keywordsEnd(); ++token_it)
{
token = token_it->second;
- // FIX: change this to use the new Token Type enum entries.
- if (token->getColor() == color) // Wow, what a disgusting hack.
+ if (token->getType() == LLKeywordToken::TT_FUNCTION)
{
primary_keywords.push_back( wstring_to_utf8str(token->getToken()) );
}