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.cpp | |
| parent | 35cec8fec8fef36a75bbb168e38c235ff0c47b49 (diff) | |
| parent | b94e2d0103168f143ee7579f01f0d45fc63a4e84 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
Diffstat (limited to 'indra/newview/llwindebug.cpp')
| -rw-r--r-- | indra/newview/llwindebug.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwindebug.cpp b/indra/newview/llwindebug.cpp index eff70ca0b2..92c80ce534 100644 --- a/indra/newview/llwindebug.cpp +++ b/indra/newview/llwindebug.cpp @@ -90,7 +90,7 @@ LONG NTAPI vectoredHandler(PEXCEPTION_POINTERS exception_infop) } // static -void LLWinDebug::init() +void LLWinDebug::initSingleton() { static bool s_first_run = true; // Load the dbghelp dll now, instead of waiting for the crash. @@ -135,7 +135,7 @@ void LLWinDebug::init() } } -void LLWinDebug::cleanup () +void LLWinDebug::cleanupSingleton() { gEmergencyMemoryReserve.release(); } |