summaryrefslogtreecommitdiff
path: root/indra/llimage
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-04-22 16:03:35 -0400
committerOz Linden <oz@lindenlab.com>2014-04-22 16:03:35 -0400
commitd00d37d23b68037fed8eeeffe21a87f7597086c3 (patch)
tree2ce3ca6ce4038ab967277ebba1ca4b8a599c50e5 /indra/llimage
parent6c8bddca3d5a790934535fdd6f176e28d181d76a (diff)
parent776aadf4ef65681084268c3866058172c89b4259 (diff)
merge changes for OPEN-199
Diffstat (limited to 'indra/llimage')
-rwxr-xr-xindra/llimage/llimagejpeg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimagejpeg.h b/indra/llimage/llimagejpeg.h
index 7ac7f5d2e0..3d364551a9 100755
--- a/indra/llimage/llimagejpeg.h
+++ b/indra/llimage/llimagejpeg.h
@@ -32,7 +32,7 @@
#include "llimage.h"
extern "C" {
-#ifdef LL_STANDALONE
+#ifdef LL_USESYSTEMLIBS
# include <jpeglib.h>
# include <jerror.h>
#else