diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-08-02 16:15:34 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-08-02 16:15:34 -0400 |
| commit | 67955043306bddcb22cee706415fe702807e1a30 (patch) | |
| tree | d13e4ea862af00dbb78dbed4468eb78a03eff28b /indra/llcommon/llerrorcontrol.h | |
| parent | 09f97172bb478a2c977d8b7b0958196e7e98c433 (diff) | |
| parent | f1eb3c1b63b97de2a91c967e5c66f7b25c4963a2 (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 |