4 files changed, 14 insertions, 53 deletions

diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 705872328a..5f23249c8d 100755
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -406,7 +406,11 @@ BOOL LLScriptEdCore::postBuild()
 
 	initMenu();
 
-	LLEnvManagerNew::instance().setRegionChangeCallback(boost::bind(&LLScriptEdCore::initKeywords(), this));
+// Make this work ;-)
+	mSyntaxIdLSL.initialise();
+	// ...
+	mEditor->mKeywords.initialise(LL_PATH_APP_SETTINGS, "keywords_lsl_default.xml");
+//	mEditor->mKeywords.initialise(mSyntaxIdLSL.getFullFileSpec());
 
 	// FIX: Refactor LLTextEditor::loadKeywords so these can be removed.
 	std::vector<std::string> funcs;
@@ -452,15 +456,6 @@ BOOL LLScriptEdCore::postBuild()
 	return TRUE;
 }
 
-void LLScriptEdCore::initKeywords()
-{
-	// Make this work ;-)
-		mSyntaxIdLSL.initialise();
-		// ...
-		mEditor->mKeywords.initialise(LL_PATH_APP_SETTINGS, "keywords_lsl_default.xml");
-	//	mEditor->mKeywords.initialise(mSyntaxIdLSL.getKeywordsXML());
-}
-
 void LLScriptEdCore::initMenu()
 {
 	// *TODO: Skinning - make these callbacks data driven
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index 149c27461e..73ccaab0b8 100755
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -78,7 +78,6 @@ public:
 	~LLScriptEdCore();
 	
 	void			initMenu();
-	void			initKeywords();
 
 	virtual void	draw();
 	/*virtual*/	BOOL	postBuild();
diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp
index 00e6086546..0249607834 100644
--- a/indra/newview/llsyntaxid.cpp
+++ b/indra/newview/llsyntaxid.cpp
@@ -248,7 +248,7 @@ void LLSyntaxIdLSL::initialise()
 				LL_WARNS("LSLSyntax")
 						<< "Filename is cached, no need to download!"
 						<< LL_ENDL;
-				loadKeywordsFileIntoLLSD();
+				openKeywordsFile();
 			}
 		}
 		else
@@ -256,58 +256,27 @@ void LLSyntaxIdLSL::initialise()
 			LL_WARNS("LSLSyntax")
 					<< "ID is null so SyntaxID does not need to be processed!"
 					<< LL_ENDL;
-			loadKeywordsFileIntoLLSD();
+			openKeywordsFile();
 		}
-		mFileNameCurrent = mFileNameNew;
-		mSyntaxIdCurrent = mSyntaxIdNew;
+		// TODO add a signal here to tell the editor the hash has changed?
 	}
 	else
 	{
 		LL_WARNS("LSLSyntax")
 				<< "No change to Syntax! Nothing to see here. Move along now!"
 				<< LL_ENDL;
+
 	}
+	//LLEnvManagerNew::instance().setRegionChangeCallback(boost::bind(&LLSyntaxIdLSL::checkSyntaxIdChange(), this));
 }
 
 //-----------------------------------------------------------------------------
-// loadKeywordsFileIntoLLSD
+// openKeywordsFile
 //-----------------------------------------------------------------------------
-/**
- * @brief	Load xml serialised LLSD
- * @desc	Opens the specified filespec and attempts to deserialise the
- *			contained data to the specified LLSD object.
- * @return	Returns boolean true/false indicating success or failure.
- */
-bool LLSyntaxIdLSL::loadKeywordsFileIntoLLSD()
+void LLSyntaxIdLSL::openKeywordsFile()
 {
 	LL_WARNS("LSLSyntax")
 			<< "Trying to open default or cached keyword file ;-)"
 			<< LL_ENDL;
-
-	bool loaded = false;
-	LLSD content;
-	llifstream file;
-	file.open(mFullFileSpec);
-	if (file.is_open())
-	{
-		loaded = (bool)LLSDSerialize::fromXML(content, file);
-		if (!loaded)
-		{
-			LL_WARNS("LSLSyntax") << "Unable to deserialise file: " << filename << LL_ENDL;
-
-			// Is this the right thing to do, or should we leave the old content
-			// even if it isn't entirely accurate anymore?
-			sKeywordsXml = LLSD.emptyMap();
-		}
-		else
-		{
-			sKeywordsXml = content;
-			LL_INFOS("LSLSyntax") << "Deserialised file: " << filename << LL_ENDL;
-		}
-	}
-	else
-	{
-		LL_WARNS("LSLSyntax") << "Unable to open file: " << filename << LL_ENDL;
-	}
-	return loaded;
+	// TODO Open the file and load LLSD into sKeywordsXml
 }
diff --git a/indra/newview/llsyntaxid.h b/indra/newview/llsyntaxid.h
index 50013a8380..d9f2572863 100644
--- a/indra/newview/llsyntaxid.h
+++ b/indra/newview/llsyntaxid.h
@@ -39,7 +39,6 @@ public:
 	bool			checkSyntaxIdChanged();
 	std::string		getFileNameCurrent()	const { return mFileNameCurrent; }
 	ELLPath			getFilePath()			const { return mFilePath; }
-	LLSD			getKeywordsXML()		const { return sKeywordsXml; }
 	LLUUID			getSyntaxId()			const { return mSyntaxIdCurrent; }
 
 	void			initialise();
@@ -51,8 +50,7 @@ protected:
 	std::string		buildFileNameNew();
 	std::string		buildFullFileSpec();
 	void			fetchKeywordsFile();
-	//void			openKeywordsFile();
-	bool			loadKeywordsFileIntoLLSD();
+	void			openKeywordsFile();
 	void			setSyntaxId(LLUUID SyntaxId) { mSyntaxIdCurrent = SyntaxId; }
 	void			setFileNameCurrent(std::string& name) { mFileNameCurrent = name; }
 	void			setFileNameDefault(std::string& name) { mFileNameDefault = name; }