diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-10-11 14:35:49 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-10-11 14:35:49 -0400 |
| commit | 0c7bc67814dd4fa347401c24ba0e1be78e4b838f (patch) | |
| tree | 450fc1ce0aff2f2880c32b3ca85161ca0ceff8a6 /indra/newview/llwindebug.h | |
| parent | b6d22de58850fc9a5b34eeb5b7930e5845bfc42d (diff) | |
| parent | 25be14381e29481413c94edf5436c0af715a1578 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llwindebug.h')
| -rw-r--r-- | indra/newview/llwindebug.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwindebug.h b/indra/newview/llwindebug.h index 90882cf04a..7e5818ba1c 100644 --- a/indra/newview/llwindebug.h +++ b/indra/newview/llwindebug.h @@ -36,9 +36,9 @@ class LLWinDebug: { LLSINGLETON_EMPTY_CTOR(LLWinDebug); public: - static void init(); + void initSingleton(); static void generateMinidump(struct _EXCEPTION_POINTERS *pExceptionInfo = NULL); - static void cleanup(); + void cleanupSingleton(); private: static void writeDumpToFile(MINIDUMP_TYPE type, MINIDUMP_EXCEPTION_INFORMATION *ExInfop, const std::string& filename); }; |