diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-14 21:02:28 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-14 21:02:28 -0400 |
| commit | 094dcc07f8c1d90ae723dbe60eddacb90a09eae8 (patch) | |
| tree | e750942e5f22ed677b543bd49509c2a7cdc5ce56 /indra/llcommon/llexception.cpp | |
| parent | d4043d3b011c32eb503c43c551872f9c24d7344f (diff) | |
| parent | 38c2a5bde985a6a8a96d912d432f8bdf7e5b60be (diff) | |
Merge DRTVWR-591-maint-X to main on promotion of secondlife/viewer #705: Maintenance X
Diffstat (limited to 'indra/llcommon/llexception.cpp')
| -rw-r--r-- | indra/llcommon/llexception.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llexception.cpp b/indra/llcommon/llexception.cpp index 0787bde57f..c0154a569f 100644 --- a/indra/llcommon/llexception.cpp +++ b/indra/llcommon/llexception.cpp @@ -3,7 +3,7 @@ * @author Nat Goodspeed * @date 2016-08-12 * @brief Implementation for llexception. - * + * * $LicenseInfo:firstyear=2016&license=viewerlgpl$ * Copyright (c) 2016, Linden Research, Inc. * $/LicenseInfo$ @@ -99,8 +99,8 @@ static const U32 STATUS_MSC_EXCEPTION = 0xE06D7363; // compiler specific U32 msc_exception_filter(U32 code, struct _EXCEPTION_POINTERS *exception_infop) { const auto stack = to_string(boost::stacktrace::stacktrace()); - LL_WARNS() << "SEH Exception handled (that probably shouldn't be): Code " << code - << "\n Stack trace: \n" + LL_WARNS() << "SEH Exception handled (that probably shouldn't be): Code " << code + << "\n Stack trace: \n" << stack << LL_ENDL; if (code == STATUS_MSC_EXCEPTION) |