diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-03 19:21:14 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-03 19:21:14 +0000 |
| commit | b5936a4b1d8780b5b8cd425998eacd2c64ffa693 (patch) | |
| tree | c1581bcf34e96a897c6e1d9a4aed95f353713baa /indra/newview/llappviewer.h | |
| parent | 55c25229b79b1755c989e5996c8e8d118f369721 (diff) | |
1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
Diffstat (limited to 'indra/newview/llappviewer.h')
| -rw-r--r-- | indra/newview/llappviewer.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 0adf178b34..d687481002 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -112,7 +112,7 @@ public: bool isInProductionGrid(); - void removeMarkerFile(); + void removeMarkerFile(bool leave_logout_marker = false); // LLAppViewer testing helpers. // *NOTE: These will potentially crash the viewer. Only for debugging. @@ -167,6 +167,10 @@ private: LLString mMarkerFileName; apr_file_t* mMarkerFile; // A file created to indicate the app is running. + LLString mLogoutMarkerFileName; + apr_file_t* mLogoutMarkerFile; // A file created to indicate the app is running. + + LLOSInfo mSysOSInfo; S32 mCrashBehavior; bool mReportedCrash; @@ -217,7 +221,9 @@ typedef enum LAST_EXEC_NORMAL = 0, LAST_EXEC_FROZE, LAST_EXEC_LLERROR_CRASH, - LAST_EXEC_OTHER_CRASH + LAST_EXEC_OTHER_CRASH, + LAST_EXEC_LOGOUT_FROZE, + LAST_EXEC_LOGOUT_CRASH } eLastExecEvent; extern eLastExecEvent gLastExecEvent; // llstartup |