summaryrefslogtreecommitdiff
path: root/indra/newview/llwindebug.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-04-27 08:40:01 -0400
committerNat Goodspeed <nat@lindenlab.com>2017-04-27 08:40:01 -0400
commitc04073da377a222d2d244c94683816c412dfad36 (patch)
tree831a9108535ddb8edfeae0bbcbc9cc215e33d293 /indra/newview/llwindebug.h
parent0d0f2a8aebd8b992764c227daac75c6964052645 (diff)
DRTVWR-418: Use conventional LLSingleton init/cleanup for LLWinDebug.
LLWinDebug, though an LLSingleton, had (and required explicit calls to) special init() and cleanup() methods. Kitty Barnett points out that the cleanup() method was actually being called after LLSingletonBase::deleteAll(), requiring resurrection of the deleted LLWinDebug, which sometimes led to crashes. (Resurrecting deleted LLSingletons is always suspect.) Change LLWinDebug::init() and cleanup() to the conventional initSingleton() and cleanupSingleton() methods. This eliminates the need to make special method calls at all. In particular, cleanupSingleton() will be called by the existing LLSingletonBase::cleanupAll() call near viewer shutdown. We retain the early LLWinDebug::instance() call, which implicitly initializes the LLWinDebug instance, because evidently we want that initialized early. But we no longer require a separate init() call.
Diffstat (limited to 'indra/newview/llwindebug.h')
-rw-r--r--indra/newview/llwindebug.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwindebug.h b/indra/newview/llwindebug.h
index 90882cf04a..5a0d63f027 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();
+ static void initSingleton();
static void generateMinidump(struct _EXCEPTION_POINTERS *pExceptionInfo = NULL);
- static void cleanup();
+ static void cleanupSingleton();
private:
static void writeDumpToFile(MINIDUMP_TYPE type, MINIDUMP_EXCEPTION_INFORMATION *ExInfop, const std::string& filename);
};