diff options
| author | Cinder <cinder.roxley@phoenixviewer.com> | 2014-05-07 19:59:41 -0600 |
|---|---|---|
| committer | Cinder <cinder.roxley@phoenixviewer.com> | 2014-05-07 19:59:41 -0600 |
| commit | a354d0efb33ddace2ef97e702b1e4449adcf51ad (patch) | |
| tree | 91c676b8f0503bd58602767044a184c2fc3313d3 /indra/newview/llpreviewscript.h | |
| parent | 618a409e13f11ce9ded294936e1f7c1d3d1e1efc (diff) | |
| parent | 8501d6494bceeea962d7251d882ddc244a8daa7f (diff) | |
Merge up.
Diffstat (limited to 'indra/newview/llpreviewscript.h')
| -rwxr-xr-x | indra/newview/llpreviewscript.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h index 99b2f811f9..8b98b908e1 100755 --- a/indra/newview/llpreviewscript.h +++ b/indra/newview/llpreviewscript.h @@ -76,7 +76,7 @@ protected: public: ~LLScriptEdCore(); - void initialiseKeywords(); + void initializeKeywords(); void initMenu(); void processKeywords(); void processLoaded(); @@ -155,7 +155,6 @@ private: BOOL mEnableSave; BOOL mHasScriptData; LLLiveLSLFile* mLiveFile; - LLSyntaxIdLSL mSyntaxIdLSL; LLScriptEdContainer* mContainer; // parent view |