storm-1831 General cleanup of cruft created during caps experiments ;-)

1 files changed, 25 insertions, 6 deletions

diff --git a/indra/newview/llsyntaxid.h b/indra/newview/llsyntaxid.h
index f7e3d6896e..d9f2572863 100644
--- a/indra/newview/llsyntaxid.h
+++ b/indra/newview/llsyntaxid.h
@@ -12,6 +12,21 @@
 #include "llviewerregion.h"
 
 
+class fetchKeywordsFileResponder : public LLHTTPClient::Responder
+{
+public:
+	std::string	mFileSpec;
+
+	fetchKeywordsFileResponder(std::string filespec);
+
+	void errorWithContent(U32 status,
+						const std::string& reason,
+						const LLSD& content);
+
+	void result(const LLSD& content_ref);
+};
+
+
 /**
  * @file llsyntaxid.h
  * @brief The LLSyntaxIdLSL class
@@ -24,7 +39,7 @@ public:
 	bool			checkSyntaxIdChanged();
 	std::string		getFileNameCurrent()	const { return mFileNameCurrent; }
 	ELLPath			getFilePath()			const { return mFilePath; }
-	LLUUID			getSyntaxId()			const { return mCurrentSyntaxId; }
+	LLUUID			getSyntaxId()			const { return mSyntaxIdCurrent; }
 
 	void			initialise();
 
@@ -32,13 +47,14 @@ public:
 
 
 protected:
-	std::string		buildFileName(LLUUID& SyntaxId);
-	bool			fetchKeywordsFile();
+	std::string		buildFileNameNew();
+	std::string		buildFullFileSpec();
+	void			fetchKeywordsFile();
 	void			openKeywordsFile();
-	void			setSyntaxId(LLUUID SyntaxId) { mCurrentSyntaxId = SyntaxId; }
+	void			setSyntaxId(LLUUID SyntaxId) { mSyntaxIdCurrent = SyntaxId; }
 	void			setFileNameCurrent(std::string& name) { mFileNameCurrent = name; }
 	void			setFileNameDefault(std::string& name) { mFileNameDefault = name; }
-	void			setFileNameNew(std::string& name) { mFileNameNew = name; }
+	void			setFileNameNew(std::string name) { mFileNameNew = name; }
 	void			setSimulatorFeatureName(const std::string& name) { mSimulatorFeature = name; }
 
 
@@ -51,13 +67,16 @@ protected:
 
 private:
 	std::string		mCapabilityName;
-	LLUUID			mCurrentSyntaxId;
+	std::string		mCapabilityURL;
 	std::string		mFileNameCurrent;
 	std::string		mFileNameDefault;
 	std::string		mFileNameNew;
 	ELLPath			mFilePath;
 	std::string		mFullFileSpec;
 	std::string		mSimulatorFeature;
+	LLUUID			mSyntaxIdCurrent;
+	LLUUID			mSyntaxIdNew;
 
 	static LLSD		sKeywordsXml;
+
 };