Style - rename previously static members, fix scope, ease up on the exclamation points in debug messages

1 files changed, 26 insertions, 32 deletions

diff --git a/indra/newview/llsyntaxid.h b/indra/newview/llsyntaxid.h
index 179d622286..d803a09167 100644
--- a/indra/newview/llsyntaxid.h
+++ b/indra/newview/llsyntaxid.h
@@ -39,30 +39,6 @@
 class LLSyntaxIdLSL : public LLSingleton<LLSyntaxIdLSL>
 {
 friend class fetchKeywordsFileResponder;
-public:
-	typedef boost::signals2::signal<void()> file_fetched_signal_t;
-
-protected:
-	bool		sInitialized;
-	LLSD		sKeywordsXml;
-	bool		sLoaded;
-	bool		sLoadFailed;
-	bool		sVersionChanged;
-	file_fetched_signal_t	sFileFetchedSignal;
-
-private:
-	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;
-
-
 
 public:
 	LLSyntaxIdLSL();
@@ -73,20 +49,19 @@ public:
 	std::string		getFileNameCurrent()	const { return mFileNameCurrent; }
 	ELLPath			getFilePath()			const { return mFilePath; }
 	std::string		getFileSpec()			const { return mFullFileSpec; }
-	LLSD			getKeywordsXML()		const { return sKeywordsXml; }
+	LLSD			getKeywordsXML()		const { return mKeywordsXml; }
 	LLUUID			getSyntaxId()			const { return mSyntaxIdCurrent; }
-	bool			isDifferentVersion()	const { return sVersionChanged; }
-	bool			isInitialized()			const { return sInitialized; }
+	bool			isDifferentVersion()	const { return mVersionChanged; }
+	bool			isInitialized()			const { return mInitialized; }
 
 	void			initialize();
-	bool			isLoaded() { return sLoaded; }
-
-	bool		isSupportedVersion(const LLSD& content);
-	void		setKeywordsXml(const LLSD& content) { sKeywordsXml = content; }
+	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:
 	std::string		buildFileNameNew();
 	std::string		buildFullFileSpec();
@@ -97,6 +72,25 @@ protected:
 	void			setFileNameCurrent(const std::string& name) { mFileNameCurrent = name; }
 	void			setFileNameDefault(const std::string& name) { mFileNameDefault = name; }
 	void			setFileNameNew(const std::string name) { mFileNameNew = name; }
+	
+private:
+	bool		mInitialized;
+	LLSD		mKeywordsXml;
+	bool		mLoaded;
+	bool		mLoadFailed;
+	bool		mVersionChanged;
+	file_fetched_signal_t	mFileFetchedSignal;
+	
+	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;
 };