diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-12-23 19:39:58 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-12-23 19:39:58 +0000 |
| commit | fb793870fe95f1951d7c30ea6068e187b9dededd (patch) | |
| tree | 6d11632353ff4fb07133625ec5031b135b1e2882 /indra/newview/llappviewerlinux.h | |
| parent | d182b9fb82b9c63f41d81bc80dbbfe627475facf (diff) | |
QAR-1142 merging 1.22 RC0-RC4 changes.
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
Diffstat (limited to 'indra/newview/llappviewerlinux.h')
| -rw-r--r-- | indra/newview/llappviewerlinux.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llappviewerlinux.h b/indra/newview/llappviewerlinux.h index a0e48ea388..2929e8a1b0 100644 --- a/indra/newview/llappviewerlinux.h +++ b/indra/newview/llappviewerlinux.h @@ -61,8 +61,9 @@ public: protected: virtual bool beingDebugged(); - - virtual void handleCrashReporting(); + + virtual bool restoreErrorTrap(); + virtual void handleCrashReporting(bool reportFreeze); virtual void handleSyncCrashTrace(); virtual bool initLogging(); |