summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsys.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-07-08 17:29:48 -0400
committerMonty Brandenberg <monty@lindenlab.com>2014-07-08 17:29:48 -0400
commit29bea5a6b94458e23559bdbeaae5a593100533b6 (patch)
tree5bd356450afd8da159542bfd444b653442004a45 /indra/llcommon/llsys.cpp
parent053f436413c01e237accabace4dc5ff1eccca837 (diff)
parent226929f8f5b8bc1080d0082b2595d689238df2b8 (diff)
Merge. Refresh from viewer-release after 3.7.11 release.
Diffstat (limited to 'indra/llcommon/llsys.cpp')
-rwxr-xr-xindra/llcommon/llsys.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index 07fe259e47..06e118aa44 100755
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -33,7 +33,7 @@
#include "llsys.h"
#include <iostream>
-#ifdef LL_STANDALONE
+#ifdef LL_USESYSTEMLIBS
# include <zlib.h>
#else
# include "zlib/zlib.h"