summaryrefslogtreecommitdiff
path: root/indra/llcommon/tests/llerror_test.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2019-03-05 04:44:29 -0500
committerOz Linden <oz@lindenlab.com>2019-03-05 04:44:29 -0500
commite86c0b3d0fbc5f91090241be959ef19bfffd8636 (patch)
tree3e72f1f8f54facf84fb0f748fc4239a839780a81 /indra/llcommon/tests/llerror_test.cpp
parente409c0492f1b1ce63606c0b693c92cdb36dcc28b (diff)
fix error message reporting?
Diffstat (limited to 'indra/llcommon/tests/llerror_test.cpp')
-rw-r--r--indra/llcommon/tests/llerror_test.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp
index 2f8923d2de..9dcb5c145f 100644
--- a/indra/llcommon/tests/llerror_test.cpp
+++ b/indra/llcommon/tests/llerror_test.cpp
@@ -70,7 +70,11 @@ namespace
namespace
{
static bool fatalWasCalled;
- void fatalCall(const std::string&) { fatalWasCalled = true; }
+ LLError::ErrCrashHandlerResult fatalCall(const std::string&)
+ {
+ fatalWasCalled = true;
+ return LLError::ERR_DO_NOT_CRASH;
+ }
}
namespace tut
@@ -120,7 +124,7 @@ namespace tut
mPriorErrorSettings = LLError::saveAndResetSettings();
LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
- LLError::overrideCrashOnError(fatalCall);
+ LLError::setFatalHandler(fatalCall);
LLError::addRecorder(mRecorder);
}