summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2023-03-07 09:39:50 -0600
committerDave Parks <davep@lindenlab.com>2023-03-07 09:39:50 -0600
commitdd17170abb08cb4ec8ebc8c7e5f38d3ad1519538 (patch)
tree1ecbcab7e68354b01632843a9c8777a1c435fd3c /indra/llcommon
parentb9b913a60ada97fc61bf2176e443dc72c8359ccb (diff)
parentc51f8b82482f7bd8c45ccc65733dd5d5eef2f076 (diff)
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llerror.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index d06c0e2132..b7dec3cb7f 100644
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -82,9 +82,11 @@ const int LL_ERR_NOERR = 0;
#ifdef SHOW_ASSERT
#define llassert(func) llassert_always_msg(func, #func)
+#define llassert_msg(func, msg) llassert_always_msg(func, msg)
#define llverify(func) llassert_always_msg(func, #func)
#else
#define llassert(func)
+#define llassert_msg(func, msg)
#define llverify(func) do {if (func) {}} while(0)
#endif