summaryrefslogtreecommitdiff
path: root/indra/llcommon/llerrorlegacy.h
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-02-25 18:24:07 -0800
committerRoxie Linden <roxie@lindenlab.com>2010-02-25 18:24:07 -0800
commit9b05fecbf6b3d65dae5a010fc35821dc116a44d0 (patch)
tree9c0df85bb3a8b5c4e58655179e1b29ee31594cfc /indra/llcommon/llerrorlegacy.h
parent5ed6e0720af1b6cdf1a983e2c040eeb5d8ae33ba (diff)
parentdb4e46e93d06c03520cb7c781b8e41b6d374414d (diff)
automated merge from trunk
Diffstat (limited to 'indra/llcommon/llerrorlegacy.h')
-rw-r--r--indra/llcommon/llerrorlegacy.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llerrorlegacy.h b/indra/llcommon/llerrorlegacy.h
index 9920921a58..476d75380f 100644
--- a/indra/llcommon/llerrorlegacy.h
+++ b/indra/llcommon/llerrorlegacy.h
@@ -34,7 +34,7 @@
#ifndef LL_LLERRORLEGACY_H
#define LL_LLERRORLEGACY_H
-
+#include "llpreprocessor.h"
/*
LEGACY -- DO NOT USE THIS STUFF ANYMORE
@@ -107,7 +107,7 @@ const int LL_ERR_PRICE_MISMATCH = -23018;
#define llwarning(msg, num) llwarns << "Warning # " << num << ": " << msg << llendl;
-#define llassert_always(func) if (!(func)) llerrs << "ASSERT (" << #func << ")" << llendl;
+#define llassert_always(func) if (LL_UNLIKELY(!(func))) llerrs << "ASSERT (" << #func << ")" << llendl;
#ifdef SHOW_ASSERT
#define llassert(func) llassert_always(func)