summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-01-22 16:19:11 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-01-22 16:19:11 +0200
commitad501d7fab624c7a85a70fb66e3e24667984f880 (patch)
tree2d5fcb404302f849e72db08ebd9664c1825ecc52 /indra/llcommon
parent74429f2ed926362a2ec47d590fc862b55b26f0f8 (diff)
parentbc0ed2a02b42ae485b2f7a08f6ec3a0c1ab85778 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/llerrorlegacy.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcommon/llerrorlegacy.h b/indra/llcommon/llerrorlegacy.h
index 7a970b1466..9920921a58 100644
--- a/indra/llcommon/llerrorlegacy.h
+++ b/indra/llcommon/llerrorlegacy.h
@@ -75,6 +75,10 @@ const int LL_ERR_PRICE_MISMATCH = -23018;
#define SHOW_ASSERT
#else // _DEBUG
+#ifdef LL_RELEASE_WITH_DEBUG_INFO
+#define SHOW_ASSERT
+#endif // LL_RELEASE_WITH_DEBUG_INFO
+
#ifdef RELEASE_SHOW_DEBUG
#define SHOW_DEBUG
#endif