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/llappviewerwin32.cpp | |
| parent | 35cec8fec8fef36a75bbb168e38c235ff0c47b49 (diff) | |
| parent | b94e2d0103168f143ee7579f01f0d45fc63a4e84 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 5107030476..d6039f6d7f 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -502,7 +502,8 @@ bool LLAppViewerWin32::init() disableWinErrorReporting(); #ifndef LL_RELEASE_FOR_DOWNLOAD - LLWinDebug::instance().init(); + // Merely requesting the LLSingleton instance initializes it. + LLWinDebug::instance(); #endif #if LL_WINDOWS @@ -526,10 +527,6 @@ bool LLAppViewerWin32::cleanup() gDXHardware.cleanup(); -#ifndef LL_RELEASE_FOR_DOWNLOAD - LLWinDebug::instance().cleanup(); -#endif - if (mIsConsoleAllocated) { FreeConsole(); |