diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
| commit | a4000c3744e42fcbb638e742f3b63fa31a0dee15 (patch) | |
| tree | 7f472c30e65bbfa04ee9bc06631a1af305cc31fb /indra/llimagej2coj | |
| parent | 6c4cadbb04d633ad7b762058bdeba6e1f650dafd (diff) | |
merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7
Diffstat (limited to 'indra/llimagej2coj')
| -rw-r--r-- | indra/llimagej2coj/llimagej2coj.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp index be6b6c817b..ec6264dcf5 100644 --- a/indra/llimagej2coj/llimagej2coj.cpp +++ b/indra/llimagej2coj/llimagej2coj.cpp @@ -37,7 +37,7 @@ #include "openjpeg.h" #include "lltimer.h" -#include "llmemory.h" +//#include "llmemory.h" const char* fallbackEngineInfoLLImageJ2CImpl() { |