Adding method to load cached/default syntax file and method to access sKeyWordsXML.

6 files changed, 69 insertions, 30 deletions

diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index 687c2fb31d..832264f074 100755
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -34,7 +34,7 @@
 #include "lltexteditor.h"
 #include "llstl.h"
 
-inline BOOL LLKeywordToken::isHead(const llwchar* s) const
+inline bool LLKeywordToken::isHead(const llwchar* s) const
 {
 	// strncmp is much faster than string compare
 	BOOL res = TRUE;
@@ -51,7 +51,7 @@ inline BOOL LLKeywordToken::isHead(const llwchar* s) const
 	return res;
 }
 
-inline BOOL LLKeywordToken::isTail(const llwchar* s) const
+inline bool LLKeywordToken::isTail(const llwchar* s) const
 {
 	BOOL res = TRUE;
 	const llwchar* t = mDelimiter.c_str();
@@ -198,7 +198,7 @@ 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(ELLPath path, const std::string filename)
 {
 	mReady = false;
 	setFilenameSyntax( gDirUtilp->getExpandedFilename(path, filename) );
@@ -214,7 +214,7 @@ BOOL LLKeywords::initialise(ELLPath path, const std::string filename)
 	return mReady;
 }
 
-BOOL LLKeywords::loadFromFile()
+bool LLKeywords::loadFromFile()
 {
 	processTokens();
 	return true;
@@ -226,14 +226,14 @@ BOOL LLKeywords::loadFromFile()
  *			contained data to the specified LLSD object.
  * @return	Returns boolean true/false indicating success or failure.
  */
-BOOL LLKeywords::loadIntoLLSD(const std::string& filename, LLSD& data)
+bool LLKeywords::loadIntoLLSD(const std::string& filename, LLSD& data)
 {
 	mLoaded = false;
 	llifstream file;
 	file.open(filename);
 	if(file.is_open())
 	{
-		mLoaded = (BOOL)LLSDSerialize::fromXML(data, file);
+		mLoaded = (bool)LLSDSerialize::fromXML(data, file);
 		if (!mLoaded)
 		{
 			LL_WARNS("") << "Unable to deserialise file: " << filename << LL_ENDL;
diff --git a/indra/llui/llkeywords.h b/indra/llui/llkeywords.h
index 1bd23549d2..f98453405d 100755
--- a/indra/llui/llkeywords.h
+++ b/indra/llui/llkeywords.h
@@ -83,8 +83,8 @@ public:
 
 	S32					getLengthHead() const	{ return mToken.size(); }
 	S32					getLengthTail() const	{ return mDelimiter.size(); }
-	BOOL				isHead(const llwchar* s) const;
-	BOOL				isTail(const llwchar* s) const;
+	bool				isHead(const llwchar* s) const;
+	bool				isTail(const llwchar* s) const;
 	const LLWString&	getToken() const		{ return mToken; }
 	const LLColor4&		getColor() const		{ return mColor; }
 	TOKEN_TYPE			getType()  const		{ return mType; }
@@ -111,13 +111,13 @@ public:
 
 	void		addColorGroup(const std::string key_in, const LLColor4 color);
 	LLColor4	getColorGroup(const std::string key_in);
-	BOOL		loadFromFile();
-	BOOL		loadFromFile(const std::string& filename);
-	BOOL		isLoaded() const	{ return mLoaded; }
+	bool		loadFromFile();
+	bool		loadFromFile(const std::string& filename);
+	bool		isLoaded() const	{ return mLoaded; }
 	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(ELLPath path, const std::string filename);
 	std::string	processColors();
 	std::string	processColors(LLSD &data, const std::string strGroup);
 	void		processTokens();
@@ -176,10 +176,10 @@ protected:
 	LLColor4	readColor(LLSD& sd);
 	void		insertSegment(std::vector<LLTextSegmentPtr>& seg_list, LLTextSegmentPtr new_segment, S32 text_len, const LLColor4 &defaultColor, class LLTextEditor& editor);
 	void		insertSegments(const LLWString& wtext, std::vector<LLTextSegmentPtr>& seg_list, LLKeywordToken* token, S32 text_len, S32 seg_start, S32 seg_end, const LLColor4 &defaultColor, LLTextEditor& editor);
-	BOOL		loadIntoLLSD( const std::string& filename, LLSD& data );
+	bool		loadIntoLLSD( const std::string& filename, LLSD& data );
 
 	LLSD		mColors;
-	BOOL		mLoaded;
+	bool		mLoaded;
 	LLSD		mSyntax;
 	word_token_map_t mWordTokenMap;
 	typedef std::deque<LLKeywordToken*> token_list_t;
@@ -194,8 +194,8 @@ protected:
 	std::string	getArguments(LLSD& args);
 
 private:
-	BOOL		ready() { return mReady; }
-	BOOL		mReady;
+	bool		ready() { return mReady; }
+	bool		mReady;
 	std::string	mFilenameSyntax;
 };
 
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 5f23249c8d..705872328a 100755
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -406,11 +406,7 @@ BOOL LLScriptEdCore::postBuild()
 
 	initMenu();
 
-// Make this work ;-)
-	mSyntaxIdLSL.initialise();
-	// ...
-	mEditor->mKeywords.initialise(LL_PATH_APP_SETTINGS, "keywords_lsl_default.xml");
-//	mEditor->mKeywords.initialise(mSyntaxIdLSL.getFullFileSpec());
+	LLEnvManagerNew::instance().setRegionChangeCallback(boost::bind(&LLScriptEdCore::initKeywords(), this));
 
 	// FIX: Refactor LLTextEditor::loadKeywords so these can be removed.
 	std::vector<std::string> funcs;
@@ -456,6 +452,15 @@ 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 73ccaab0b8..149c27461e 100755
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -78,6 +78,7 @@ 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 0249607834..00e6086546 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;
-				openKeywordsFile();
+				loadKeywordsFileIntoLLSD();
 			}
 		}
 		else
@@ -256,27 +256,58 @@ void LLSyntaxIdLSL::initialise()
 			LL_WARNS("LSLSyntax")
 					<< "ID is null so SyntaxID does not need to be processed!"
 					<< LL_ENDL;
-			openKeywordsFile();
+			loadKeywordsFileIntoLLSD();
 		}
-		// TODO add a signal here to tell the editor the hash has changed?
+		mFileNameCurrent = mFileNameNew;
+		mSyntaxIdCurrent = mSyntaxIdNew;
 	}
 	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));
 }
 
 //-----------------------------------------------------------------------------
-// openKeywordsFile
+// loadKeywordsFileIntoLLSD
 //-----------------------------------------------------------------------------
-void LLSyntaxIdLSL::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()
 {
 	LL_WARNS("LSLSyntax")
 			<< "Trying to open default or cached keyword file ;-)"
 			<< LL_ENDL;
-	// TODO Open the file and load LLSD into sKeywordsXml
+
+	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;
 }
diff --git a/indra/newview/llsyntaxid.h b/indra/newview/llsyntaxid.h
index d9f2572863..50013a8380 100644
--- a/indra/newview/llsyntaxid.h
+++ b/indra/newview/llsyntaxid.h
@@ -39,6 +39,7 @@ 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();
@@ -50,7 +51,8 @@ protected:
 	std::string		buildFileNameNew();
 	std::string		buildFullFileSpec();
 	void			fetchKeywordsFile();
-	void			openKeywordsFile();
+	//void			openKeywordsFile();
+	bool			loadKeywordsFileIntoLLSD();
 	void			setSyntaxId(LLUUID SyntaxId) { mSyntaxIdCurrent = SyntaxId; }
 	void			setFileNameCurrent(std::string& name) { mFileNameCurrent = name; }
 	void			setFileNameDefault(std::string& name) { mFileNameDefault = name; }