phoenix-firestorm/indra/llimage
Ansariel aac968e43a Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llqueuedthread.cpp
#	indra/llcommon/lluuid.cpp
#	indra/llimage/llimageworker.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewerobject.h
#	indra/newview/llvovolume.cpp
#	indra/newview/pipeline.cpp
2023-05-17 23:23:28 +02:00
..
tests SL-17483: Recast LLImageDecodeThread as a facade for ThreadPool. 2022-06-09 12:06:23 -04:00
CMakeLists.txt Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically 2022-05-01 00:38:40 +02:00
llimage.cpp Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2022-12-19 22:51:09 +01:00
llimage.h Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2022-12-19 22:51:09 +01:00
llimagebmp.cpp
llimagebmp.h
llimagedimensionsinfo.cpp
llimagedimensionsinfo.h
llimagedxt.cpp
llimagedxt.h
llimagefilter.cpp
llimagefilter.h
llimagej2c.cpp Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer 2022-06-03 15:07:06 +02:00
llimagej2c.h
llimagejpeg.cpp Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-12 17:31:39 +01:00
llimagejpeg.h
llimagepng.cpp
llimagepng.h
llimagetga.cpp
llimagetga.h
llimageworker.cpp Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-05-17 23:23:28 +02:00
llimageworker.h Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-05-17 21:40:54 +02:00
llmapimagetype.h
llpngwrapper.cpp Correct macOS png loader to use a default gamma of 2.2 as apple has done since OS 10.6 2022-10-30 18:05:34 -04:00
llpngwrapper.h