merge changes for STORM-1831

1 files changed, 3 insertions, 0 deletions

diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index 9fb0a4fb63..2dd5a1b6a7 100755
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -35,6 +35,7 @@
 #include "lliconctrl.h"
 #include "llframetimer.h"
 #include "llfloatergotoline.h"
+#include "llsyntaxid.h"
 
 class LLLiveLSLFile;
 class LLMessageSystem;
@@ -77,6 +78,7 @@ public:
 	~LLScriptEdCore();
 	
 	void			initMenu();
+	void			onRegionChangeInitialiseKeywords();
 
 	virtual void	draw();
 	/*virtual*/	BOOL	postBuild();
@@ -149,6 +151,7 @@ private:
 	BOOL			mEnableSave;
 	BOOL			mHasScriptData;
 	LLLiveLSLFile*	mLiveFile;
+	LLSyntaxIdLSL	mSyntaxIdLSL;
 
 	LLScriptEdContainer* mContainer; // parent view
 };