livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Making initialisation of mKeywords conditional on mSyntaxIdLSL having loaded an XML file.

meow-7.2.2
Ima Mechanique 2014-01-30 13:01:19 +00:00
parent f14521e1d4
commit 4bcb67c704
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
indra/newview/llpreviewscript.cpp
View File

@ -395,7 +395,7 @@ BOOL LLScriptEdCore::postBuild()
{
mErrorList = getChild<LLScrollListCtrl>("lsl errors");
mFunctions = getChild<LLComboBox>( "Insert...");
mFunctions = getChild<LLComboBox>("Insert...");
childSetCommitCallback("Insert...", &LLScriptEdCore::onBtnInsertFunction, this);
@ -419,37 +419,42 @@ void LLScriptEdCore::onRegionChangeInitialiseKeywords()
{
mEditor->mKeywords.clearLoaded();
mSyntaxIdLSL.initialise();
mEditor->mKeywords.initialise(mSyntaxIdLSL.getKeywordsXML());
mEditor->loadKeywords();
std::vector<std::string> primary_keywords;
std::vector<std::string> secondary_keywords;
LLKeywordToken *token;
LLKeywords::keyword_iterator_t token_it;
for (token_it = mEditor->keywordsBegin(); token_it != mEditor->keywordsEnd(); ++token_it)
if (mSyntaxIdLSL.isLoaded())
{
token = token_it->second;
if (token->getType() == LLKeywordToken::TT_FUNCTION)
mEditor->mKeywords.initialise(mSyntaxIdLSL.getKeywordsXML());
mEditor->loadKeywords();
std::vector<std::string> primary_keywords;
std::vector<std::string> secondary_keywords;
LLKeywordToken *token;
LLKeywords::keyword_iterator_t token_it;
for (token_it = mEditor->keywordsBegin(); token_it != mEditor->keywordsEnd(); ++token_it)
{
primary_keywords.push_back( wstring_to_utf8str(token->getToken()) );
token = token_it->second;
if (token->getType() == LLKeywordToken::TT_FUNCTION)
{
primary_keywords.push_back( wstring_to_utf8str(token->getToken()) );
}
else
{
secondary_keywords.push_back( wstring_to_utf8str(token->getToken()) );
}
}
else
for (std::vector<std::string>::const_iterator iter= primary_keywords.begin();
iter!= primary_keywords.end(); ++iter)
{
secondary_keywords.push_back( wstring_to_utf8str(token->getToken()) );
mFunctions->add(*iter);
}
}
for (std::vector<std::string>::const_iterator iter= primary_keywords.begin();
iter!= primary_keywords.end(); ++iter)
{
mFunctions->add(*iter);
}
for (std::vector<std::string>::const_iterator iter= secondary_keywords.begin();
iter!= secondary_keywords.end(); ++iter)
{
mFunctions->add(*iter);
for (std::vector<std::string>::const_iterator iter= secondary_keywords.begin();
iter!= secondary_keywords.end(); ++iter)
{
mFunctions->add(*iter);
}
}
}