summaryrefslogtreecommitdiff
path: root/indra/newview/llwindebug.cpp
diff options
context:
space:
mode:
authorAnkur Ahlawat <anchor@lindenlab.com>2018-01-17 15:53:56 -0800
committerAnkur Ahlawat <anchor@lindenlab.com>2018-01-17 15:53:56 -0800
commit5a12a88f7b53bb99a6b302c35d891a8ecee59855 (patch)
treedd52f7a9f76ac5d696a517f351371ceb619b7d30 /indra/newview/llwindebug.cpp
parentd4ce47b09122d1f76601ba402c2b9ad6bb504950 (diff)
parent7acbd8ed8d73c507675d45360df07d232c431a8b (diff)
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llwindebug.cpp')
-rw-r--r--indra/newview/llwindebug.cpp4
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();
}