diff options
author | Oz Linden <oz@lindenlab.com> | 2019-01-16 11:05:55 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2019-01-16 11:05:55 -0500 |
commit | f648758c2a3da2dd03c8f57e98598c085b2030a6 (patch) | |
tree | 44fe8f158cbc667f95e7061e6137a3e8d73bc49e /indra/llcommon/llsingleton.cpp | |
parent | 6c533888ba3770572f2d7958460688562f03bfde (diff) |
SL-10297: Modify LL_ERRS and other deliberate crashes to avoid a common stack frame
Diffstat (limited to 'indra/llcommon/llsingleton.cpp')
-rw-r--r-- | indra/llcommon/llsingleton.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/llcommon/llsingleton.cpp b/indra/llcommon/llsingleton.cpp index c45c144570..6f254ef670 100644 --- a/indra/llcommon/llsingleton.cpp +++ b/indra/llcommon/llsingleton.cpp @@ -461,15 +461,7 @@ void LLSingletonBase::logerrs(const char* p1, const char* p2, const char* p3, co // https://www.youtube.com/watch?v=OMG7paGJqhQ (emphasis on OMG) std::ostringstream out; out << p1 << p2 << p3 << p4; - auto crash = LLError::getFatalFunction(); - if (crash) - { - crash(out.str()); - } - else - { - LLError::crashAndLoop(out.str()); - } + LLERROR_CRASH; } std::string LLSingletonBase::demangle(const char* mangled) |