diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-09-26 16:39:16 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-09-26 16:39:16 -0400 |
| commit | 1e8851c4dfc40fe7dc39b7b3cfae5af97f709290 (patch) | |
| tree | cabe478fbe5fb3b2fce720820a43801df3c25c4c /indra/llcommon/llerrorcontrol.h | |
| parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) | |
| parent | 9fd463bd9496ba5d97abec6ee75b9c0c089aa69d (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/llerrorcontrol.h')
| -rw-r--r-- | indra/llcommon/llerrorcontrol.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llcommon/llerrorcontrol.h b/indra/llcommon/llerrorcontrol.h index caf2ba72c2..ddbcdc94a0 100644 --- a/indra/llcommon/llerrorcontrol.h +++ b/indra/llcommon/llerrorcontrol.h @@ -102,6 +102,9 @@ namespace LLError LL_COMMON_API FatalFunction getFatalFunction(); // Retrieve the previously-set FatalFunction + LL_COMMON_API std::string getFatalMessage(); + // Retrieve the message last passed to FatalFunction, if any + /// temporarily override the FatalFunction for the duration of a /// particular scope, e.g. for unit tests class LL_COMMON_API OverrideFatalFunction |