storm-1831 Switch to use the llsyntaxid keywords LLSD directly

3 files changed, 5 insertions, 15 deletions

diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index 687c2fb31d..ac95a20588 100755
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -198,19 +198,10 @@ LLColor4 LLKeywords::getColorGroup(const std::string key_in)
 	return LLUIColorTable::instance().getColor(ColourGroup);
 }
 
-BOOL LLKeywords::initialise(ELLPath path, const std::string filename)
+bool LLKeywords::initialise(LLSD SyntaxXML)
 {
-	mReady = false;
-	setFilenameSyntax( gDirUtilp->getExpandedFilename(path, filename) );
-
-	if (! loadIntoLLSD(mFilenameSyntax, mSyntax) )
-	{
-		LL_ERRS("") << "Failed to load syntax data from '" << mFilenameSyntax << "', cannot continue!" << LL_ENDL;
-	}
-	else
-	{
-		mReady = true;
-	}
+	mSyntax = SyntaxXML;
+	mLoaded = mReady = true;
 	return mReady;
 }
 
diff --git a/indra/llui/llkeywords.h b/indra/llui/llkeywords.h
index 1bd23549d2..24a0450912 100755
--- a/indra/llui/llkeywords.h
+++ b/indra/llui/llkeywords.h
@@ -117,7 +117,7 @@ public:
 	void		setFilenameSyntax(const std::string filename) { mFilenameSyntax = filename; }
 
 	void		findSegments(std::vector<LLTextSegmentPtr> *seg_list, const LLWString& text, const LLColor4 &defaultColor, class LLTextEditor& editor );
-	BOOL		initialise(ELLPath path, const std::string filename);
+	bool		initialise(LLSD SyntaxXML);
 	std::string	processColors();
 	std::string	processColors(LLSD &data, const std::string strGroup);
 	void		processTokens();
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;