diff options
| author | simon <none@none> | 2013-09-09 12:59:17 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-09-09 12:59:17 -0700 |
| commit | e7ac4695e31821118dd1bc9ddc95f46f012abbda (patch) | |
| tree | f971732dddf9173d5a9a75163f5e8312a3d5054a /indra/newview/llappviewer.h | |
| parent | 36dea0dad802158a0e546220163f4461fbd3e204 (diff) | |
| parent | 55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff) | |
Merge viewer-release
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rwxr-xr-x | indra/newview/llappviewer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 3af360b529..3ae8a78845 100755 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -42,6 +42,7 @@ class LLImageDecodeThread; class LLTextureFetch; class LLWatchdogTimeout; class LLUpdaterService; +class LLViewerJoystick; extern LLFastTimer::DeclareTimer FTM_FRAME; @@ -255,6 +256,8 @@ private: std::string mSerialNumber; bool mPurgeCache; bool mPurgeOnExit; + bool mMainLoopInitialized; + LLViewerJoystick* joystick; bool mSavedFinalSnapshot; bool mSavePerAccountSettings; // only save per account settings if login succeeded |