From ce7682c2a468e926d6b38e4f95bd289a8d26222c Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Wed, 18 Jul 2007 21:22:40 +0000 Subject: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release (only inside indra) (josh) Original log message was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance bos updated it to be: svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance However, it appears it actually was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance ... missing some file additions. --- indra/llimage/llimagejpeg.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'indra/llimage') diff --git a/indra/llimage/llimagejpeg.h b/indra/llimage/llimagejpeg.h index b068090882..a94f238ff0 100644 --- a/indra/llimage/llimagejpeg.h +++ b/indra/llimage/llimagejpeg.h @@ -14,8 +14,13 @@ #include "llimage.h" extern "C" { -#include "jpeglib/jpeglib.h" -#include "jpeglib/jerror.h" +#ifdef LL_STANDALONE +# include +# include +#else +# include "jpeglib/jpeglib.h" +# include "jpeglib/jerror.h" +#endif } class LLImageJPEG : public LLImageFormatted -- cgit v1.2.3