diff options
author | Lynx Linden <lynx@lindenlab.com> | 2010-06-07 12:14:13 +0100 |
---|---|---|
committer | Lynx Linden <lynx@lindenlab.com> | 2010-06-07 12:14:13 +0100 |
commit | 185cd5d261a4bc6e02f49f40c72d76da4320a881 (patch) | |
tree | c08ae4afb5e79f6b90bfe085a32b4d3e6e16a070 /indra/newview/llappviewer.h | |
parent | eec00a712fff079009ae793d86e27b7f3ab13053 (diff) | |
parent | edd224dc7b08ad72c0f36c5b0f24912fdf66ab1c (diff) |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llappviewer.h')
-rw-r--r-- | indra/newview/llappviewer.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index 5acd6e11c4..0b862a92a1 100644 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -92,9 +92,7 @@ public: virtual bool restoreErrorTrap() = 0; // Require platform specific override to reset error handling mechanism. // return false if the error trap needed restoration. virtual void handleCrashReporting(bool reportFreeze = false) = 0; // What to do with crash report? - virtual void handleSyncCrashTrace() = 0; // any low-level crash-prep that has to happen in the context of the crashing thread before the crash report is delivered. static void handleViewerCrash(); // Hey! The viewer crashed. Do this, soon. - static void handleSyncViewerCrash(); // Hey! The viewer crashed. Do this right NOW in the context of the crashing thread. void checkForCrash(); // Thread accessors |