summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewscript.cpp
diff options
context:
space:
mode:
authorIma Mechanique <ima.mechanique@secondlife.com>2013-11-10 22:47:34 +0000
committerIma Mechanique <ima.mechanique@secondlife.com>2013-11-10 22:47:34 +0000
commit1cf2acf6d70c5ce68d6faedffbbf2b070f2a6fd7 (patch)
tree795efc997ca4f814fb2b62f38cce0e974b944473 /indra/newview/llpreviewscript.cpp
parent009245510149c26337ac1cca64a367cd2234725b (diff)
Fixing some small discrepencies.
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
-rwxr-xr-xindra/newview/llpreviewscript.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 0cf8dbe9c5..143703f60e 100755
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -406,20 +406,16 @@ BOOL LLScriptEdCore::postBuild()
initMenu();
- return initKeywords();
+ initKeywords();
+
+ return TRUE;
}
-bool LLScriptEdCore::initKeywords()
+void LLScriptEdCore::initKeywords()
{
- // Make this work ;-)
mSyntaxIdLSL.initialise();
- // ...
mEditor->mKeywords.initialise(mSyntaxIdLSL.getKeywordsXML());
- // FIX: Refactor LLTextEditor::loadKeywords so these can be removed.
- //std::vector<std::string> funcs;
- //std::vector<std::string> tooltips;
-
LLColor3 color(0.5f, 0.0f, 0.15f);
mEditor->loadKeywords();
@@ -443,6 +439,7 @@ bool LLScriptEdCore::initKeywords()
// Case-insensitive dictionary sort for primary keywords. We don't sort the secondary
// keywords. They're intelligently grouped in keywords.ini.
+ // As we don't use keywords.ini, this is no longer true. Do we need to sort now?
std::stable_sort( primary_keywords.begin(), primary_keywords.end(), LLSECKeywordCompare() );
for (std::vector<std::string>::const_iterator iter= primary_keywords.begin();
@@ -456,8 +453,6 @@ bool LLScriptEdCore::initKeywords()
{
mFunctions->add(*iter);
}
-
- return TRUE;
}
void LLScriptEdCore::initMenu()