diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-01-17 03:20:12 +0200 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-01-17 03:20:12 +0200 |
commit | 57a99273ed023bd71c54399969e66ffc23eebc57 (patch) | |
tree | d8569d41eaf78348e458f550f382375cac47924d /indra/newview/llwindebug.cpp | |
parent | 6ac2b2bb4f569b6663607894034b4ec64804e905 (diff) | |
parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) |
Merged in lindenlab/viewer-release
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(); } |