diff options
| author | Richard Linden <none@none> | 2013-10-24 14:37:57 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-24 14:37:57 -0700 |
| commit | dc60a7564abf16cbf269e47cfc33ed00c6bb0870 (patch) | |
| tree | d8096d7e77da9079171135e590e265a5966f6d7b /indra/llcommon/llerror.h | |
| parent | 4264060662c1a598856622a749ea4a3216c5975c (diff) | |
SH-4577 WIP Interesting: viewer crashed when clicking a offline Conversation containing a shared object
potential fix by making instance tracker allow key collisions for LLToastNotifyPanel
changed assertion macro to use original unpreprocessed source code
renamed instance tracker behavior macros to use LL prefix
added RestoreCameraPosOnLogin setting to optionally restore old camera positioning behavior
Diffstat (limited to 'indra/llcommon/llerror.h')
| -rwxr-xr-x | indra/llcommon/llerror.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h index 046cd69543..5268cf9a4d 100755 --- a/indra/llcommon/llerror.h +++ b/indra/llcommon/llerror.h @@ -72,11 +72,13 @@ const int LL_ERR_NOERR = 0; #endif // !_DEBUG -#define llassert_always(func) if (LL_UNLIKELY(!(func))) LL_ERRS() << "ASSERT (" << #func << ")" << LL_ENDL; +#define llassert_always_msg(func, msg) if (LL_UNLIKELY(!(func))) LL_ERRS() << "ASSERT (" << msg << ")" << LL_ENDL + +#define llassert_always(func) llassert_always_msg(func, #func) #ifdef SHOW_ASSERT -#define llassert(func) llassert_always(func) -#define llverify(func) llassert_always(func) +#define llassert(func) llassert_always_msg(func, #func) +#define llverify(func) llassert_always_msg(func, #func) #else #define llassert(func) #define llverify(func) do {if (func) {}} while(0) |