diff options
author | elektrahesse | 2010-10-13 04:09:26 +0200 |
---|---|---|
committer | elektrahesse | 2010-10-13 04:09:26 +0200 |
commit | d39b5c51f3a7cd36a4dc86423ce099e421263bcc (patch) | |
tree | 1f8703cd9e938acff57c158873d5819ceb6dc5b5 /linden/indra/newview/floaterlocalassetbrowse.h | |
parent | Added CodeBastard Redgrave and Elektra Hesse as Imp Devels on the minimap :) (diff) | |
download | meta-impy-d39b5c51f3a7cd36a4dc86423ce099e421263bcc.zip meta-impy-d39b5c51f3a7cd36a4dc86423ce099e421263bcc.tar.gz meta-impy-d39b5c51f3a7cd36a4dc86423ce099e421263bcc.tar.bz2 meta-impy-d39b5c51f3a7cd36a4dc86423ce099e421263bcc.tar.xz |
Added support for upload and local usage of PSD (Photoshop, including layers and native transparency) and TIFF images (including alpha channel) on any Intel Mac using native Quartz/vImage routines
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/floaterlocalassetbrowse.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/newview/floaterlocalassetbrowse.h b/linden/indra/newview/floaterlocalassetbrowse.h index e02a7d3..69afe98 100644 --- a/linden/indra/newview/floaterlocalassetbrowse.h +++ b/linden/indra/newview/floaterlocalassetbrowse.h | |||
@@ -114,6 +114,10 @@ class LocalBitmap | |||
114 | IMG_EXTEN_TGA, | 114 | IMG_EXTEN_TGA, |
115 | IMG_EXTEN_JPG, | 115 | IMG_EXTEN_JPG, |
116 | IMG_EXTEN_PNG | 116 | IMG_EXTEN_PNG |
117 | #ifdef LL_DARWIN | ||
118 | ,IMG_EXTEN_PSD, | ||
119 | IMG_EXTEN_TIFF | ||
120 | #endif | ||
117 | }; | 121 | }; |
118 | 122 | ||
119 | enum bitmap_type | 123 | enum bitmap_type |