diff options
| author | Aleric Inglewood | 2010-10-22 00:51:53 +0200 |
|---|---|---|
| committer | Aleric Inglewood | 2010-10-22 00:51:53 +0200 |
| commit | 7c4e01af677907b75694b9c4827d6f3ba56a5e19 (patch) | |
| tree | fd743d3cefc7d4e671c6a6429be50e76191bbd9c /linden/indra/llimage | |
| parent | Don't dump callstacks at clean exit of viewer. (diff) | |
| parent | Changed version to Experimental 2010.10.17 (diff) | |
| download | meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.zip meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.tar.gz meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.tar.bz2 meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.tar.xz | |
Merge branch 'weekly' of http://github.com/imprudence/imprudence into weekly
Diffstat (limited to 'linden/indra/llimage')
| -rw-r--r-- | linden/indra/llimage/llimage.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h index 2bc62fb..fd8d128 100644 --- a/linden/indra/llimage/llimage.h +++ b/linden/indra/llimage/llimage.h | |||
| @@ -73,7 +73,13 @@ typedef enum e_image_codec | |||
| 73 | IMG_CODEC_JPEG = 5, | 73 | IMG_CODEC_JPEG = 5, |
| 74 | IMG_CODEC_DXT = 6, | 74 | IMG_CODEC_DXT = 6, |
| 75 | IMG_CODEC_PNG = 7, | 75 | IMG_CODEC_PNG = 7, |
| 76 | #ifdef LL_DARWIN | ||
| 77 | IMG_CODEC_PSD = 8, | ||
| 78 | IMG_CODEC_TIFF = 9, | ||
| 79 | IMG_CODEC_EOF = 10 | ||
| 80 | #else | ||
| 76 | IMG_CODEC_EOF = 8 | 81 | IMG_CODEC_EOF = 8 |
| 82 | #endif | ||
| 77 | } EImageCodec; | 83 | } EImageCodec; |
| 78 | 84 | ||
| 79 | //============================================================================ | 85 | //============================================================================ |