Shyotl b865b92a6a Merge branch 'FMODStudio' ...

Conflicts:
	indra/cmake/PNG.cmake
	indra/newview/llnetmap.cpp
	indra/newview/llviewermessage.cpp



PARAMETERS: CLEAN

2015-01-26 17:15:46 -06:00

..

tests

Add support for libcwd.

2011-05-08 17:08:48 +02:00

CMakeLists.txt

CMake cleanup and organization

2013-03-05 12:24:51 -05:00

llimage.cpp

All your codebase are belong to us.

2014-08-22 00:15:09 -04:00

llimage.h

Minor upstream catchup. Added LLImageRaw::duplicate and no_copy parameter to LLImageRaw::LLImageRaw

2013-10-26 16:39:31 -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

Lindie viewer-dev catchup regarding rendering pipeline.

2012-06-30 20:05:31 -05:00

llimagedxt.h

Some cleanup. Using gAgentAvatarp in many places. Incl other misc small changes.

2011-10-03 22:45:13 -05:00

llimagej2c.cpp

Remove LLMemType and related files

2013-03-04 12:02:01 -05:00

llimagej2c.h

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llimagejpeg.cpp

Imported existing code

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

llimagejpeg.h

Resolve stray VC8 CRT dependency by updating libs

2011-05-05 03:20:54 +02:00

llimagepng.cpp

Compile foxies

2014-12-05 18:43:50 -05:00

llimagepng.h

-Sanity checks from snowglobe. ...

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

llimagetga.cpp

Lindie viewer-dev catchup regarding rendering pipeline.

2012-06-30 20:05:31 -05:00

llimagetga.h

Imported existing code

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

llimageworker.cpp

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llimageworker.h

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llmapimagetype.h

Imported existing code

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

llpngwrapper.cpp

[Warnings] Fix sign/unsigned mismatch

2014-12-12 20:21:36 -05:00

llpngwrapper.h

Merge branch 'FMODStudio'

2015-01-26 17:15:46 -06:00