diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2017-05-04 13:51:16 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2017-05-04 13:51:16 -0400 |
commit | 07ec10781e45b3d92e27e92ddad39cf74fa7ff0b (patch) | |
tree | c5df107f638de079ff537d0b1b82befc294e7997 /indra/newview/llwindebug.h | |
parent | 35cec8fec8fef36a75bbb168e38c235ff0c47b49 (diff) | |
parent | b94e2d0103168f143ee7579f01f0d45fc63a4e84 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
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); }; |