From 5e27952ee4698006c86ebdca60c4eab305ddebac Mon Sep 17 00:00:00 2001
From: Ima Mechanique <ima.mechanique@secondlife.com>
Date: Sun, 10 Nov 2013 20:24:13 +0000
Subject: storm-1831 Switch to use the llsyntaxid keywords LLSD directly

---
 indra/newview/llpreviewscript.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/newview')

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;
-- 
cgit v1.2.3