diff --git a/indra/newview/fslslpreproc.cpp b/indra/newview/fslslpreproc.cpp
index 499ed29837..d902baff10 100644
--- a/indra/newview/fslslpreproc.cpp
+++ b/indra/newview/fslslpreproc.cpp
@@ -680,7 +680,7 @@ void FSLSLPreprocessor::FSProcCacheCallback(LLVFS *vfs, const LLUUID& iuuid, LLA
 	}
 }
 
-void FSLSLPreprocessor::preprocess_script(BOOL close, bool sync, BOOL defcache)
+void FSLSLPreprocessor::preprocess_script(BOOL close, bool sync, bool defcache)
 {
 	mClose = close;
 	mSync = sync;
@@ -944,7 +944,7 @@ void FSLSLPreprocessor::start_process()
 		return;
 	}
 
-	mWaving = TRUE;
+	mWaving = true;
 	boost::wave::util::file_position_type current_position;
 	std::string input = mCore->mEditor->getText();
 	std::string rinput = input;
@@ -1117,7 +1117,7 @@ void FSLSLPreprocessor::start_process()
 		{
 			if (caching_files.size() != 0)
 			{
-				mWaving = FALSE;
+				mWaving = false;
 				return;
 			}
 			current_position = (*first).get_position();
@@ -1251,7 +1251,7 @@ void FSLSLPreprocessor::start_process()
 		mCore->mPostScript = output;
 		mCore->doSaveComplete((void*)mCore, mClose, mSync);
 	}
-	mWaving = FALSE;
+	mWaving = false;
 }
 
 #else
@@ -1278,7 +1278,7 @@ void FSLSLPreprocessor::FSProcCacheCallback(LLVFS *vfs, const LLUUID& uuid, LLAs
 {
 }
 
-void FSLSLPreprocessor::preprocess_script(BOOL close, BOOL defcache)
+void FSLSLPreprocessor::preprocess_script(BOOL close, bool sync, bool defcache)
 {
 	LLTextEditor* outfield = mCore->mPostEditor;
 	if(outfield)
diff --git a/indra/newview/fslslpreproc.h b/indra/newview/fslslpreproc.h
index deb3356383..dd47d698f7 100644
--- a/indra/newview/fslslpreproc.h
+++ b/indra/newview/fslslpreproc.h
@@ -46,7 +46,7 @@ class FSLSLPreprocessor
 public:
 
 	FSLSLPreprocessor(LLScriptEdCore* corep)
-		: mCore(corep), mWaving(FALSE), mClose(FALSE), mSync(false)
+		: mCore(corep), mWaving(false), mClose(FALSE), mSync(false)
 	{}
 
 	static bool mono_directive(std::string const& text, bool agent_inv = true);
@@ -59,7 +59,7 @@ public:
 	static LLUUID findInventoryByName(std::string name);
 	static void FSProcCacheCallback(LLVFS *vfs, const LLUUID& uuid, LLAssetType::EType type,
 									void *userdata, S32 result, LLExtStat extstat);
-	void preprocess_script(BOOL close = FALSE, bool sync = false, BOOL defcache = FALSE);
+	void preprocess_script(BOOL close = FALSE, bool sync = false, bool defcache = false);
 	void start_process();
 	void display_error(std::string err);
 
@@ -75,19 +75,18 @@ public:
 	//as this isn't the case I'm not going to preserve this structure across logins.
 
 	//(it seems rather dumb that readable scripts don't show the asset id without a DL, but thats beside the point.)
-	static std::map<std::string,LLUUID> cached_assetids;
+	static std::map<std::string, LLUUID> cached_assetids;
 
-	static std::map<std::string,std::string> decollided_literals;
+	static std::map<std::string, std::string> decollided_literals;
 
 	std::set<std::string> caching_files;
 	std::set<std::string> defcached_files;
 	bool mDefinitionCaching;
 
 	LLScriptEdCore* mCore;
-	BOOL mWaving;
+	bool mWaving;
 	BOOL mClose;
 	bool mSync;
-	BOOL mHDDInclude;
 	std::string mMainScriptName;
 };