diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-10-14 00:52:00 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-10-14 00:52:00 +0300 |
commit | f9e7e59405a161828ec5dde624299b8aa67dc5b7 (patch) | |
tree | 227aae383792ddcae99e70aad41c7f97edcd8e59 /indra/llcommon/llapp.h | |
parent | 9d6f7363cb26f4d77210109fe2b0cd90a2f4ab71 (diff) | |
parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
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 *); |