summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsdserialize.cpp
diff options
context:
space:
mode:
authorRicky Curtice <kf6kjg+hg@gmail.com>2014-06-05 06:31:30 -0700
committerRicky Curtice <kf6kjg+hg@gmail.com>2014-06-05 06:31:30 -0700
commit98720c3cec8f1ab4af5e66f9d9b7bb9c277b78f1 (patch)
treeef36b7031df4c96eab6b5f3343325f662382932c /indra/llcommon/llsdserialize.cpp
parent644ca6a0f8a7759119814f88df93b8e838321a12 (diff)
parent15d8f355072f2184f046a7aafb1b5c606fe97880 (diff)
Merge
Diffstat (limited to 'indra/llcommon/llsdserialize.cpp')
-rwxr-xr-xindra/llcommon/llsdserialize.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index 04d7a6ed56..b0e5fd0b5f 100755
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -34,7 +34,7 @@
#include <iostream>
#include "apr_base64.h"
-#ifdef LL_STANDALONE
+#ifdef LL_USESYSTEMLIBS
# include <zlib.h>
#else
# include "zlib/zlib.h" // for davep's dirty little zip functions