4 files changed, 182 insertions, 323 deletions

diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 76cb1c1ebc..9ff0ece7d9 100755
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -399,13 +399,9 @@ LLScriptEdCore::~LLScriptEdCore()
 	}
 
 	delete mLiveFile;
-	if (mRegionChangedCallback.connected())
+	if (mSyntaxIDConnection.connected())
 	{
-		mRegionChangedCallback.disconnect();
-	}
-	if (mFileFetchedCallback.connected())
-	{
-		mFileFetchedCallback.disconnect();
+		mSyntaxIDConnection.disconnect();
 	}
 }
 
@@ -425,79 +421,48 @@ BOOL LLScriptEdCore::postBuild()
 
 	initMenu();
 
-	mFileFetchedCallback = LLSyntaxIdLSL::getInstance()->addFileFetchedCallback(boost::bind(&LLScriptEdCore::processKeywords, this));
+	mSyntaxIDConnection = LLSyntaxIdLSL::getInstance()->addSyntaxIDCallback(boost::bind(&LLScriptEdCore::processKeywords, this));
 
 	// Intialise keyword highlighting for the current simulator's version of LSL
 	LLSyntaxIdLSL::getInstance()->initialize();
-
-	if (LLSyntaxIdLSL::getInstance()->isDifferentVersion())
-	{
-		processLoaded();
-	}
-	else
-	{
-		processKeywords();
-	}
-	
-	if (mLive)
-	{
-		mRegionChangedCallback = gAgent.addRegionChangedCallback(boost::bind(&LLScriptEdCore::processLoaded, this));
-	}
+	processKeywords();
 
 	return TRUE;
 }
 
-void LLScriptEdCore::processLoaded()
-{
-	LLSyntaxIdLSL::getInstance()->initialize();
-	if (LLSyntaxIdLSL::getInstance()->isLoaded())
-	{
-		processKeywords();
-	}
-	else
-	{
-		LL_DEBUGS("SyntaxLSL") << "Hashes are different, waiting for the syntax file to be retrieved." << LL_ENDL;
-	}
-}
-
 void LLScriptEdCore::processKeywords()
 {
-	if (LLSyntaxIdLSL::getInstance()->isLoaded())
-	{
-		LL_DEBUGS("SyntaxLSL") << "Hashes are different, updating highlighter." << LL_ENDL;
-
-		mEditor->clearSegments();
-
-		mEditor->initKeywords();
-		mEditor->loadKeywords();
-
-		string_vec_t primary_keywords;
-		string_vec_t secondary_keywords;
-		LLKeywordToken *token;
-		LLKeywords::keyword_iterator_t token_it;
-		for (token_it = mEditor->keywordsBegin(); token_it != mEditor->keywordsEnd(); ++token_it)
-		{
-			token = token_it->second;
-			if (token->getType() == LLKeywordToken::TT_FUNCTION)
-			{
-				primary_keywords.push_back( wstring_to_utf8str(token->getToken()) );
-			}
-			else
-			{
-				secondary_keywords.push_back( wstring_to_utf8str(token->getToken()) );
-			}
-		}
-		for (string_vec_t::const_iterator iter = primary_keywords.begin();
-			 iter!= primary_keywords.end(); ++iter)
+	LL_DEBUGS("SyntaxLSL") << "Processing keywords" << LL_ENDL;
+	mEditor->clearSegments();
+	mEditor->initKeywords();
+	mEditor->loadKeywords();
+	
+	string_vec_t primary_keywords;
+	string_vec_t secondary_keywords;
+	LLKeywordToken *token;
+	LLKeywords::keyword_iterator_t token_it;
+	for (token_it = mEditor->keywordsBegin(); token_it != mEditor->keywordsEnd(); ++token_it)
+	{
+		token = token_it->second;
+		if (token->getType() == LLKeywordToken::TT_FUNCTION)
 		{
-			mFunctions->add(*iter);
+			primary_keywords.push_back( wstring_to_utf8str(token->getToken()) );
 		}
-		for (string_vec_t::const_iterator iter = secondary_keywords.begin();
-			 iter!= secondary_keywords.end(); ++iter)
+		else
 		{
-			mFunctions->add(*iter);
+			secondary_keywords.push_back( wstring_to_utf8str(token->getToken()) );
 		}
 	}
+	for (string_vec_t::const_iterator iter = primary_keywords.begin();
+		 iter!= primary_keywords.end(); ++iter)
+	{
+		mFunctions->add(*iter);
+	}
+	for (string_vec_t::const_iterator iter = secondary_keywords.begin();
+		 iter!= secondary_keywords.end(); ++iter)
+	{
+		mFunctions->add(*iter);
+	}
 }
 
 void LLScriptEdCore::initMenu()
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index 5aab3ed938..9ea191e928 100755
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -159,8 +159,7 @@ private:
 	LLScriptEdContainer* mContainer; // parent view
 
 public:
-	boost::signals2::connection mFileFetchedCallback;
-	boost::signals2::connection mRegionChangedCallback;
+	boost::signals2::connection mSyntaxIDConnection;
 
 };
 
diff --git a/indra/newview/llsyntaxid.cpp b/indra/newview/llsyntaxid.cpp
index 0ef5993ac1..5b5bab85d0 100644
--- a/indra/newview/llsyntaxid.cpp
+++ b/indra/newview/llsyntaxid.cpp
@@ -1,8 +1,8 @@
 /**
  * @file LLSyntaxId
- * @author Ima Mechanique
  * @brief Handles downloading, saving, and checking of LSL keyword/syntax files
  *		for each region.
+ * @author Ima Mechanique, Cinder Roxley
  *
  * $LicenseInfo:firstyear=2013&license=viewerlgpl$
  * Second Life Viewer Source Code
@@ -28,189 +28,149 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#include "llsyntaxid.h"
 #include "llagent.h"
 #include "llappviewer.h"
 #include "llhttpclient.h"
 #include "llsdserialize.h"
-#include "llsyntaxid.h"
+#include "llviewerregion.h"
 
 //-----------------------------------------------------------------------------
 // fetchKeywordsFileResponder
 //-----------------------------------------------------------------------------
-fetchKeywordsFileResponder::fetchKeywordsFileResponder(const std::string& filespec)
-:	mFileSpec(filespec)
+class fetchKeywordsFileResponder : public LLHTTPClient::Responder
 {
-	LL_DEBUGS("SyntaxLSL") << "Instantiating with file saving to: '" << filespec << "'" << LL_ENDL;
-}
+public:
+	fetchKeywordsFileResponder(const std::string& filespec)
+	: mFileSpec(filespec)
+	{
+		LL_DEBUGS("SyntaxLSL") << "Instantiating with file saving to: '" << filespec << "'" << LL_ENDL;
+	}
 
-void fetchKeywordsFileResponder::errorWithContent(U32 status,
-												  const std::string& reason,
-												  const LLSD& content)
-{
-	LLSyntaxIdLSL::getInstance()->mLoadFailed = true;
-	LL_WARNS("SyntaxLSL") << "fetchKeywordsFileResponder error [status:" << status << "]: " << content << LL_ENDL;
-}
+	virtual void errorWithContent(U32 status,
+								  const std::string& reason,
+								  const LLSD& content)
+	{
+	LL_WARNS("SyntaxLSL") << "failed to fetch syntax file [status:" << status << "]: " << content << LL_ENDL;
+	}
 
-void fetchKeywordsFileResponder::result(const LLSD& content_ref)
-{
+	virtual void result(const LLSD& content_ref)
+	{
 	// Continue only if a valid LLSD object was returned.
 	if (content_ref.isMap())
 	{
-		LL_DEBUGS("SyntaxLSL") << "content_ref isMap so assuming valid XML." << LL_ENDL;
-
 		if (LLSyntaxIdLSL::getInstance()->isSupportedVersion(content_ref))
 		{
-			LL_DEBUGS("SyntaxLSL") << "Supported verson of syntax file." << LL_ENDL;
-
 			LLSyntaxIdLSL::getInstance()->setKeywordsXml(content_ref);
-			LLSyntaxIdLSL::getInstance()->mInitialized = true;
-			LLSyntaxIdLSL::getInstance()->mLoaded = true;
-			LLSyntaxIdLSL::getInstance()->mLoadFailed = false;
 
 			cacheFile(content_ref);
+			LLSyntaxIdLSL::getInstance()->handleFileFetched(mFileSpec);
 		}
 		else
 		{
-			LLSyntaxIdLSL::getInstance()->mLoaded = false;
-			LLSyntaxIdLSL::getInstance()->mLoadFailed = true;
 			LL_WARNS("SyntaxLSL") << "Unknown or unsupported version of syntax file." << LL_ENDL;
 		}
 	}
 	else
 	{
-		LLSyntaxIdLSL::getInstance()->mLoaded = false;
-		LLSyntaxIdLSL::getInstance()->mLoadFailed = true;
 		LL_WARNS("SyntaxLSL") << "Syntax file '" << mFileSpec << "' contains invalid LLSD." << LL_ENDL;
 	}
-
-	LLSyntaxIdLSL::getInstance()->mFileFetchedSignal();
 }
 
-void fetchKeywordsFileResponder::cacheFile(const LLSD& content_ref)
-{
-	std::stringstream str;
-	LLSDSerialize::toPrettyXML(content_ref, str);
-	const std::string xml = str.str();
-
-	// save the str to disc, usually to the cache.
-	llofstream file(mFileSpec, std::ios_base::out);
-	file.write(xml.c_str(), str.str().size());
-	file.close();
+	void cacheFile(const LLSD& content_ref)
+	{
+		std::stringstream str;
+		LLSDSerialize::toXML(content_ref, str);
+		const std::string xml = str.str();
 
-	LL_DEBUGS("SyntaxLSL") << "Syntax file received, saving as: '" << mFileSpec << "'" << LL_ENDL;
-}
+		// save the str to disk, usually to the cache.
+		llofstream file(mFileSpec, std::ios_base::out);
+		file.write(xml.c_str(), str.str().size());
+		file.close();
 
+		LL_DEBUGS("SyntaxLSL") << "Syntax file received, saving as: '" << mFileSpec << "'" << LL_ENDL;
+	}
+	
+private:
+	std::string mFileSpec;
+};
+	
 //-----------------------------------------------------------------------------
 // LLSyntaxIdLSL
 //-----------------------------------------------------------------------------
-const std::string LLSyntaxIdLSL::CAPABILITY_NAME = "LSLSyntax";
-const std::string LLSyntaxIdLSL::FILENAME_DEFAULT = "keywords_lsl_default.xml";
-const std::string LLSyntaxIdLSL::SIMULATOR_FEATURE = "LSLSyntaxId";
+const std::string SYNTAX_ID_CAPABILITY_NAME = "LSLSyntax";
+const std::string SYNTAX_ID_SIMULATOR_FEATURE = "LSLSyntaxId";
+const std::string FILENAME_DEFAULT = "keywords_lsl_default.xml";
 
 /**
  * @brief LLSyntaxIdLSL constructor
  */
-LLSyntaxIdLSL::LLSyntaxIdLSL() :
-	mInitialized(false),
-	mKeywordsXml(LLSD()),
-	mLoaded(false),
-	mLoadFailed(false),
-	mVersionChanged(false),
-	mCapabilityName(CAPABILITY_NAME),
-	mCapabilityURL(""),
-	mFileNameCurrent(FILENAME_DEFAULT),
-	mFileNameDefault(FILENAME_DEFAULT),
-	mFileNameNew(""),
-	mFilePath(LL_PATH_APP_SETTINGS),
-	mSimulatorFeature(SIMULATOR_FEATURE),
-	mSyntaxIdCurrent(LLUUID()),
-	mSyntaxIdNew(LLUUID())
+LLSyntaxIdLSL::LLSyntaxIdLSL()
+:	mKeywordsXml(LLSD())
+,	mCapabilityURL(std::string())
+,	mFilePath(LL_PATH_APP_SETTINGS)
+,	mSyntaxId(LLUUID())
 {
+	mRegionChangedCallback = gAgent.addRegionChangedCallback(boost::bind(&LLSyntaxIdLSL::handleRegionChanged, this));
+	handleRegionChanged(); // Kick off an initial caps query and fetch
 }
 
 void LLSyntaxIdLSL::buildFullFileSpec()
 {
-	ELLPath path = mSyntaxIdNew.isNull() ? LL_PATH_APP_SETTINGS : LL_PATH_CACHE;
-	mFileNameNew = mSyntaxIdNew.isNull() ? mFileNameDefault : "keywords_lsl_" + mSyntaxIdNew.asString() + ".llsd.xml";
-	mFullFileSpec = gDirUtilp->getExpandedFilename(path, mFileNameNew);
+	ELLPath path = mSyntaxId.isNull() ? LL_PATH_APP_SETTINGS : LL_PATH_CACHE;
+	const std::string filename = mSyntaxId.isNull() ? FILENAME_DEFAULT : "keywords_lsl_" + mSyntaxId.asString() + ".llsd.xml";
+	mFullFileSpec = gDirUtilp->getExpandedFilename(path, filename);
 }
 
 //-----------------------------------------------------------------------------
-// checkSyntaxIdChange()
+// syntaxIdChange()
 //-----------------------------------------------------------------------------
-bool LLSyntaxIdLSL::checkSyntaxIdChanged()
+bool LLSyntaxIdLSL::syntaxIdChanged()
 {
-	mVersionChanged = false;
+	bool version_changed = false;
 	LLViewerRegion* region = gAgent.getRegion();
 
 	if (region)
 	{
-		if (!region->capabilitiesReceived())
-		{   // Shouldn't be possible, but experience shows that it may be needed.
-			mLoadFailed = true;
-			LL_INFOS("SyntaxLSL") << "Region '" << region->getName() << "' has not received capabilities yet. Cannot process SyntaxId." << LL_ENDL;
-		}
-		else
+		if (region->capabilitiesReceived())
 		{
-			LLSD simFeatures;
-			region->getSimulatorFeatures(simFeatures);
+			LLSD sim_features;
+			region->getSimulatorFeatures(sim_features);
 
-			// Does the sim have the required feature
-			if (simFeatures.has(mSimulatorFeature))
+			if (sim_features.has(SYNTAX_ID_SIMULATOR_FEATURE))
 			{
 				// get and check the hash
-				mSyntaxIdNew = simFeatures[mSimulatorFeature].asUUID();
-				mCapabilityURL = region->getCapability(mCapabilityName);
-				if (mSyntaxIdCurrent != mSyntaxIdNew)
-				{
-					LL_DEBUGS("SyntaxLSL") << "Region has LSLSyntaxId capability, and the new hash is '" << mSyntaxIdNew.asString() << "'" << LL_ENDL;
-
-					mVersionChanged = true;
-				}
-				else
-				{
-					LL_DEBUGS("SyntaxLSL") << "Region has the same LSLSyntaxId! Leaving hash as '" << mSyntaxIdCurrent.asString() << "'" << LL_ENDL;
-				}
-			}
-			else
-			{
-				if ( mSyntaxIdCurrent.isNull() && isInitialized())
+				LLUUID new_syntax_id = sim_features[SYNTAX_ID_SIMULATOR_FEATURE].asUUID();
+				mCapabilityURL = region->getCapability(SYNTAX_ID_CAPABILITY_NAME);
+				LL_DEBUGS("SyntaxLSL") << SYNTAX_ID_SIMULATOR_FEATURE << " capability URL: " << mCapabilityURL << LL_ENDL;
+				if (new_syntax_id != mSyntaxId)
 				{
-					LL_DEBUGS("SyntaxLSL") << "Region does not have LSLSyntaxId capability, remaining with default keywords." << LL_ENDL;
+					LL_DEBUGS("SyntaxLSL") << "New SyntaxID '" << new_syntax_id << "' found." << LL_ENDL;
+					mSyntaxId = new_syntax_id;
+					version_changed = true;
 				}
 				else
-				{
-					// The hash is set to NULL_KEY to indicate use of default keywords file
-					mSyntaxIdNew = LLUUID();
-					LL_DEBUGS("SyntaxLSL") << "Region does not have LSLSyntaxId capability, using default keywords." << LL_ENDL;
-					mVersionChanged = true;
-				}
+					LL_DEBUGS("SyntaxLSL") << "SyntaxID matches what we have." << LL_ENDL;
 			}
 		}
+		else
+		{
+			LL_WARNS("SyntaxLSL") << "Region '" << region->getName() << "' has not received capabilities. Cannot process SyntaxId." << LL_ENDL;
+		}
 	}
-	return mVersionChanged;
-}
-
-/**
- * @brief LLSyntaxIdLSL::fetching
- * If the XML has not loaded yet and it hasn't failed, then we're still fetching it.
- * @return bool Whether the file fetch is still in process.
- */
-bool LLSyntaxIdLSL::fetching()
-{
-	return !(mLoaded || mLoadFailed);
+	return version_changed;
 }
 
 //-----------------------------------------------------------------------------
 // fetchKeywordsFile
 //-----------------------------------------------------------------------------
-void LLSyntaxIdLSL::fetchKeywordsFile()
+void LLSyntaxIdLSL::fetchKeywordsFile(const std::string& filespec)
 {
+	mInflightFetches.push_back(filespec);
 	LLHTTPClient::get(mCapabilityURL,
-					  new fetchKeywordsFileResponder(mFullFileSpec),
-					  LLSD(), 30.f
-					  );
-	LL_DEBUGS("SyntaxLSL") << "LSLSyntaxId capability URL is: " << mCapabilityURL << ". Filename to use is: '" << mFullFileSpec << "'." << LL_ENDL;
+					  new fetchKeywordsFileResponder(filespec),
+					  LLSD(), 30.f);
+	LL_DEBUGS("SyntaxLSL") << "LSLSyntaxId capability URL is: " << mCapabilityURL << ". Filename to use is: '" << filespec << "'." << LL_ENDL;
 }
 
 
@@ -219,55 +179,40 @@ void LLSyntaxIdLSL::fetchKeywordsFile()
 //-----------------------------------------------------------------------------
 void LLSyntaxIdLSL::initialize()
 {
-	mFileNameNew = mFileNameCurrent;
-	mSyntaxIdNew = mSyntaxIdCurrent;
-
-	if (checkSyntaxIdChanged())
+	if (mSyntaxId.isNull())
 	{
-		mKeywordsXml = LLSD();
-		mLoaded = mLoadFailed = false;
+		loadDefaultKeywordsIntoLLSD();
+	}
+	else if (!mCapabilityURL.empty())
+	{
+		LL_DEBUGS("SyntaxLSL") << "LSL version has changed, getting appropriate file." << LL_ENDL;
 
-		if (mSyntaxIdNew.isNull())
-		{ // Need to open the default
-			loadDefaultKeywordsIntoLLSD();
-		}
-		else if (!mCapabilityURL.empty() )
+		// Need a full spec regardless of file source, so build it now.
+		buildFullFileSpec();
+		if (mSyntaxId.notNull())
 		{
-			LL_DEBUGS("SyntaxLSL") << "LSL version has changed, getting appropriate file." << LL_ENDL;
-
-			// Need a full spec regardless of file source, so build it now.
-			buildFullFileSpec();
-			if ( !mSyntaxIdNew.isNull())
-			{
-				if ( !gDirUtilp->fileExists(mFullFileSpec) )
-				{ // Does not exist, so fetch it from the capability
-					LL_INFOS("SyntaxLSL") << "LSL syntax not cached, attempting download." << LL_ENDL;
-					fetchKeywordsFile();
-				}
-				else
-				{
-					loadKeywordsIntoLLSD();
-				}
+			if (!gDirUtilp->fileExists(mFullFileSpec))
+			{ // Does not exist, so fetch it from the capability
+				LL_DEBUGS("SyntaxLSL") << "LSL syntax not cached, attempting download." << LL_ENDL;
+				fetchKeywordsFile(mFullFileSpec);
 			}
 			else
-			{ // Need to open the default
-				loadDefaultKeywordsIntoLLSD();
+			{
+				LL_DEBUGS("SyntaxLSL") << "Found cached Syntax file: " << mFullFileSpec << " Loading keywords." << LL_ENDL;
+				loadKeywordsIntoLLSD();
 			}
 		}
 		else
 		{
-			mLoadFailed = true;
-			LL_WARNS("SyntaxLSL") << "LSLSyntaxId capability URL is empty." << LL_ENDL;
+			LL_DEBUGS("SyntaxLSL") << "LSLSyntaxId is null. Loading default values" << LL_ENDL;
 			loadDefaultKeywordsIntoLLSD();
 		}
 	}
-	else if (!isInitialized())
+	else
 	{
+		LL_DEBUGS("SyntaxLSL") << "LSLSyntaxId capability URL is empty." << LL_ENDL;
 		loadDefaultKeywordsIntoLLSD();
 	}
-
-	mFileNameCurrent = mFileNameNew;
-	mSyntaxIdCurrent = mSyntaxIdNew;
 }
 
 //-----------------------------------------------------------------------------
@@ -278,7 +223,7 @@ const std::string LLSD_SYNTAX_LSL_VERSION_KEY("llsd-lsl-syntax-version");
 
 bool LLSyntaxIdLSL::isSupportedVersion(const LLSD& content)
 {
-	bool isValid = false;
+	bool is_valid = false;
 	/*
 	 * If the schema used to store LSL keywords and hints changes, this value is incremented
 	 * Note that it should _not_ be changed if the keywords and hints _content_ changes.
@@ -290,15 +235,15 @@ bool LLSyntaxIdLSL::isSupportedVersion(const LLSD& content)
 
 		if (content[LLSD_SYNTAX_LSL_VERSION_KEY].asInteger() == LLSD_SYNTAX_LSL_VERSION_EXPECTED)
 		{
-			isValid = true;
+			is_valid = true;
 		}
 	}
 	else
 	{
-		LL_DEBUGS("SyntaxLSL") << "No LSL syntax version key." << LL_ENDL;
+		LL_DEBUGS("SyntaxLSL") << "Missing LSL syntax version key." << LL_ENDL;
 	}
 
-	return isValid;
+	return is_valid;
 }
 
 //-----------------------------------------------------------------------------
@@ -306,8 +251,7 @@ bool LLSyntaxIdLSL::isSupportedVersion(const LLSD& content)
 //-----------------------------------------------------------------------------
 void LLSyntaxIdLSL::loadDefaultKeywordsIntoLLSD()
 {
-	LL_DEBUGS("SyntaxLSL") << "LSLSyntaxId is null so we will use the default file." << LL_ENDL;
-	mSyntaxIdNew = LLUUID();
+	mSyntaxId.setNull();
 	buildFullFileSpec();
 	loadKeywordsIntoLLSD();
 }
@@ -323,46 +267,52 @@ void LLSyntaxIdLSL::loadDefaultKeywordsIntoLLSD()
  */
 void LLSyntaxIdLSL::loadKeywordsIntoLLSD()
 {
-	LL_DEBUGS("SyntaxLSL") << "Trying to open cached or default keyword file" << LL_ENDL;
-
-	// Is this the right thing to do, or should we leave the old content
-	// even if it isn't entirely accurate anymore?
-	mKeywordsXml = LLSD().emptyMap();
-
 	LLSD content;
 	llifstream file;
 	file.open(mFullFileSpec);
 	if (file.is_open())
 	{
-		mLoaded = (bool)LLSDSerialize::fromXML(content, file);
-		if (!mLoaded)
-		{
-			LL_WARNS("SyntaxLSL") << "Unable to deserialise: " << mFullFileSpec << LL_ENDL;
-		}
-		else
+		if (LLSDSerialize::fromXML(content, file) != LLSDParser::PARSE_FAILURE)
 		{
 			if (isSupportedVersion(content))
 			{
-				mKeywordsXml = content;
-				mLoaded = true;
-				mInitialized = true;
 				LL_DEBUGS("SyntaxLSL") << "Deserialised: " << mFullFileSpec << LL_ENDL;
 			}
 			else
 			{
-				mLoaded = false;
 				LL_WARNS("SyntaxLSL") << "Unknown or unsupported version of syntax file." << LL_ENDL;
 			}
 		}
 	}
 	else
 	{
-		LL_WARNS("SyntaxLSL") << "Unable to open: " << mFullFileSpec << LL_ENDL;
+		LL_WARNS("SyntaxLSL") << "Failed to open: " << mFullFileSpec << LL_ENDL;
+	}
+	mKeywordsXml = content;
+	mSyntaxIDChangedSignal();
+}
+
+bool LLSyntaxIdLSL::keywordFetchInProgress()
+{
+	return !mInflightFetches.empty();
+}
+
+void LLSyntaxIdLSL::handleRegionChanged()
+{
+	if (syntaxIdChanged())
+	{
+		buildFullFileSpec();
+		fetchKeywordsFile(mFullFileSpec);
 	}
-	mLoadFailed = !mLoaded;
 }
 
-boost::signals2::connection LLSyntaxIdLSL::addFileFetchedCallback(const file_fetched_signal_t::slot_type& cb)
+void LLSyntaxIdLSL::handleFileFetched(const std::string& filepath)
+{
+	mInflightFetches.remove(filepath);
+	loadKeywordsIntoLLSD();
+}
+
+boost::signals2::connection LLSyntaxIdLSL::addSyntaxIDCallback(const syntax_id_changed_signal_t::slot_type& cb)
 {
-	return mFileFetchedSignal.connect(cb);
+	return mSyntaxIDChangedSignal.connect(cb);
 }
diff --git a/indra/newview/llsyntaxid.h b/indra/newview/llsyntaxid.h
index 2288fb4ab8..70f6b28337 100644
--- a/indra/newview/llsyntaxid.h
+++ b/indra/newview/llsyntaxid.h
@@ -2,7 +2,7 @@
  * @file llsyntaxid.h
  * @brief Contains methods to access the LSLSyntaxId feature and LSLSyntax capability
  * to use the appropriate syntax file for the current region's LSL version.
- * @author Ima Mechanique
+ * @author Ima Mechanique, Cinder Roxley
  *
  * $LicenseInfo:firstyear=2013&license=viewerlgpl$
  * Second Life Viewer Source Code
@@ -30,98 +30,43 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#include "llagent.h"
-#include "llenvmanager.h"
-#include "llhttpclient.h"
 #include "llsingleton.h"
-#include "llviewerregion.h"
+
+class fetchKeywordsFileResponder;
 
 class LLSyntaxIdLSL : public LLSingleton<LLSyntaxIdLSL>
 {
-friend class fetchKeywordsFileResponder;
-
-public:
-	LLSyntaxIdLSL();
-
-	bool			checkSyntaxIdChanged();
-	bool			fetching();
-	std::string		getFileNameCurrent()	const { return mFileNameCurrent; }
-	ELLPath			getFilePath()			const { return mFilePath; }
-	std::string		getFileSpec()			const { return mFullFileSpec; }
-	LLSD			getKeywordsXML()		const { return mKeywordsXml; }
-	LLUUID			getSyntaxId()			const { return mSyntaxIdCurrent; }
-	bool			isDifferentVersion()	const { return mVersionChanged; }
-	bool			isInitialized()			const { return mInitialized; }
-
-	void			initialize();
-	bool			isLoaded() { return mLoaded; }
-
-	bool			isSupportedVersion(const LLSD& content);
-	void			setKeywordsXml(const LLSD& content) { mKeywordsXml = content; }
-	typedef			boost::signals2::signal<void()> file_fetched_signal_t;
-	boost::signals2::connection		addFileFetchedCallback(const file_fetched_signal_t::slot_type& cb);
-
-protected:
-	void			buildFullFileSpec();
-	void			fetchKeywordsFile();
-	void			loadDefaultKeywordsIntoLLSD();
-	void			loadKeywordsIntoLLSD();
-	void			setSyntaxId(LLUUID SyntaxId) { mSyntaxIdCurrent = SyntaxId; }
-	void			setFileNameCurrent(const std::string& name) { mFileNameCurrent = name; }
-	void			setFileNameNew(const std::string name) { mFileNameNew = name; }
+	friend class LLSingleton<LLSyntaxIdLSL>;
+	friend class fetchKeywordsFileResponder;
 	
 private:
-	static const std::string CAPABILITY_NAME;
-	static const std::string FILENAME_DEFAULT;
-	static const std::string SIMULATOR_FEATURE;
-
-	bool		mInitialized;
-	LLSD		mKeywordsXml;
-	bool		mLoaded;
-	bool		mLoadFailed;
-	bool		mVersionChanged;
-	file_fetched_signal_t	mFileFetchedSignal;
+	std::list<std::string> mInflightFetches;
+	typedef boost::signals2::signal<void()> syntax_id_changed_signal_t;
+	syntax_id_changed_signal_t mSyntaxIDChangedSignal;
+	boost::signals2::connection mRegionChangedCallback;
+	
+	bool	syntaxIdChanged();
+	bool	isSupportedVersion(const LLSD& content);
+	void	handleRegionChanged();
+	void	handleFileFetched(const std::string& filepath);
+	void	setKeywordsXml(const LLSD& content) { mKeywordsXml = content; };
+	void	buildFullFileSpec();
+	void	fetchKeywordsFile(const std::string& filespec);
+	void	loadDefaultKeywordsIntoLLSD();
+	void	loadKeywordsIntoLLSD();
 	
-	std::string		mCapabilityName;
 	std::string		mCapabilityURL;
-	std::string		mFileNameCurrent;
-	std::string		mFileNameDefault;
-	std::string		mFileNameNew;
-	ELLPath			mFilePath;
 	std::string		mFullFileSpec;
-	std::string		mSimulatorFeature;
-	LLUUID			mSyntaxIdCurrent;
-	LLUUID			mSyntaxIdNew;
-};
-
-
-class fetchKeywordsFileResponder : public LLHTTPClient::Responder
-{
+	ELLPath			mFilePath;
+	LLUUID			mSyntaxId;
+	LLSD			mKeywordsXml;
+	
 public:
-	std::string	mFileSpec;
-
-	/**
-	 * @brief fetchKeywordsFileResponder
-	 * @param filespec	File path and name of where to save the returned data
-	 */
-	fetchKeywordsFileResponder(const std::string& filespec);
-
-	void errorWithContent(U32 status,
-						const std::string& reason,
-						const LLSD& content);
-
-	/**
-	 * @brief Checks the returned LLSD for version and stores it in the LLSyntaxIdLSL object.
-	 * @param content_ref The returned LLSD.
-	 */
-	void result(const LLSD& content_ref);
-
-	/**
-	 * @brief Saves the returned file to the location provided at instantiation.
-	 *			Could be extended to manage cached entries.
-	 * @param content_ref	The LSL syntax file for the sim.
-	 */
-	void cacheFile(const LLSD& content_ref);
+	LLSyntaxIdLSL();
+	void initialize();
+	bool keywordFetchInProgress();
+	LLSD getKeywordsXML() const { return mKeywordsXml; };
+	boost::signals2::connection addSyntaxIDCallback(const syntax_id_changed_signal_t::slot_type& cb);
 };
 
 #endif // LLSYNTAXID_H