diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-11-02 22:45:42 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-11-02 22:55:55 +0200 |
| commit | 98d96f0dea03d96b5be2947d05cd3cb55950afc6 (patch) | |
| tree | 41b1e71182f6cbdcefcc6cf8c0ca979113e25c9e /indra/llcommon/llapp.h | |
| parent | 5c5a1973a137c05b8b25498158e36adc6dcf2717 (diff) | |
Manually resolving conflicts after merge with DRTVWR-520
This reverts commit 0a745b47880fb16b1db8cd3327377a383dbfe6a8.
Diffstat (limited to 'indra/llcommon/llapp.h')
| -rw-r--r-- | indra/llcommon/llapp.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h index 5fa91b8bf5..83f3bf3f93 100644 --- a/indra/llcommon/llapp.h +++ b/indra/llcommon/llapp.h @@ -49,10 +49,6 @@ void clear_signals(); #endif -namespace google_breakpad { - class ExceptionHandler; // See exception_handler.h -} - class LL_COMMON_API LLApp { friend class LLErrorThread; @@ -236,7 +232,6 @@ public: static const U32 MAX_MINDUMP_PATH_LENGTH = 256; // change the directory where Breakpad minidump files are written to - void setMiniDumpDir(const std::string &path); void setDebugFileNames(const std::string &path); // Return the Google Breakpad minidump filename after a crash. @@ -316,9 +311,6 @@ private: private: // the static application instance if it was created. static LLApp* sApplication; - - google_breakpad::ExceptionHandler * mExceptionHandler; - #if !LL_WINDOWS friend void default_unix_signal_handler(int signum, siginfo_t *info, void *); |