Shyotl 4d4c49cd24 Merge branch 'master' into V2TextureSystem ...

Conflicts:
	indra/newview/llviewerimage.cpp
	indra/newview/pipeline.h

2011-04-12 22:29:49 -05:00

..

tests

Imported existing code

2010-04-02 02:48:44 -03:00

aes.cpp

f

2010-08-22 15:14:30 -04:00

aes.h

add completed support for new aes encrypted image comments

2010-08-07 23:33:09 +00:00

CMakeLists.txt

Put in some changes along sg1.4 dev history.

2010-11-21 15:57:44 +01:00

llimage.cpp

Texture console now shows number of 'cached' raw images.

2011-04-07 03:16:11 -05:00

llimage.h

Texture console now shows number of 'cached' raw images.

2011-04-07 03:16:11 -05:00

llimagebmp.cpp

Imported existing code

2010-04-02 02:48:44 -03:00

llimagebmp.h

Imported existing code

2010-04-02 02:48:44 -03:00

llimagedxt.cpp

Imported existing code

2010-04-02 02:48:44 -03:00

llimagedxt.h

Imported existing code

2010-04-02 02:48:44 -03:00

llimagej2c.cpp

U32 LLImageJ2C::mAreaUsedForDataSizeCalcs now initialized to 0

2011-03-27 19:00:36 -05:00

llimagej2c.h

OpenJPEG experiment, PCH circumcision

2011-03-20 04:44:58 +01:00

llimagejpeg.cpp

Imported existing code

2010-04-02 02:48:44 -03:00

llimagejpeg.h

Stupid headers -.- workaround

2011-03-26 04:02:51 +01:00

llimagemetadatareader.cpp

Windows compile fixed and ao fixed I think...

2010-08-10 01:10:03 -05:00

llimagemetadatareader.h

add missing header file for last commit

2010-08-07 23:33:33 +00:00

llimagepng.cpp

Texture console now shows number of 'cached' raw images.

2011-04-07 03:16:11 -05:00

llimagepng.h

-Sanity checks from snowglobe. ...

2010-10-01 00:35:39 -05:00

llimagetga.cpp

Imported existing code

2010-04-02 02:48:44 -03:00

llimagetga.h

Imported existing code

2010-04-02 02:48:44 -03:00

llimageworker.cpp

Stop j2c decode throbbing

2011-04-06 04:25:05 +02:00

llimageworker.h

V2 llimage merge

2011-02-22 18:21:02 -06:00

llmapimagetype.h

Imported existing code

2010-04-02 02:48:44 -03:00

llpngwrapper.cpp

Transparent PNG fix, by Thickbrick

2011-02-16 20:24:03 +01:00

llpngwrapper.h

Transparent PNG fix, by Thickbrick

2011-02-16 20:24:03 +01:00