diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-07-10 00:23:01 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-07-10 00:23:01 +0300 |
| commit | 58c86cf59ee26dbadd359a28d8b16409c856e966 (patch) | |
| tree | 55d22b0f408f7b0bcda4b5dcefb12ff47bcfd286 /indra/llimage | |
| parent | 70c2472e427c2d58edd857d298ea9f1fbe4bd41f (diff) | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
merge changes for 3.7.12-release
Diffstat (limited to 'indra/llimage')
| -rwxr-xr-x | indra/llimage/llimagejpeg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimagejpeg.h b/indra/llimage/llimagejpeg.h index 5b596d9fa4..2142660c81 100755 --- a/indra/llimage/llimagejpeg.h +++ b/indra/llimage/llimagejpeg.h @@ -33,7 +33,7 @@ #include "llwin32headerslean.h" extern "C" { -#ifdef LL_STANDALONE +#ifdef LL_USESYSTEMLIBS # include <jpeglib.h> # include <jerror.h> #else |