summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorIma Mechanique <ima.mechanique@secondlife.com>2013-11-10 20:24:13 +0000
committerIma Mechanique <ima.mechanique@secondlife.com>2013-11-10 20:24:13 +0000
commit5e27952ee4698006c86ebdca60c4eab305ddebac (patch)
tree23d6511759a06a9c41c3b6d7d10b882d06f9aa7b /indra/newview
parent06ed74f177983e2eb170426712f422253a0b48e7 (diff)
storm-1831 Switch to use the llsyntaxid keywords LLSD directly
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llpreviewscript.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 5f23249c8d..b464845256 100755
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -409,8 +409,7 @@ BOOL LLScriptEdCore::postBuild()
// Make this work ;-)
mSyntaxIdLSL.initialise();
// ...
- mEditor->mKeywords.initialise(LL_PATH_APP_SETTINGS, "keywords_lsl_default.xml");
-// mEditor->mKeywords.initialise(mSyntaxIdLSL.getFullFileSpec());
+ mEditor->mKeywords.initialise(mSyntaxIdLSL.getKeywordsXML());
// FIX: Refactor LLTextEditor::loadKeywords so these can be removed.
std::vector<std::string> funcs;