Ansariel 3f145c0c3f Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-563 ... # Conflicts: # indra/llcommon/llframetimer.cpp # indra/llcommon/llprofiler.h # indra/newview/pipeline.cpp # indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml # indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml # indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml		2022-08-30 22:17:59 +02:00
..
tests	SL-17483: Recast LLImageDecodeThread as a facade for ThreadPool.	2022-06-09 12:06:23 -04:00
CMakeLists.txt	Merge branch 'master' into DRTVWR-543-maint	2021-12-26 14:01:17 +02:00
llimage.cpp	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-563	2022-08-30 22:17:59 +02:00
llimage.h	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-563	2022-08-30 22:17:59 +02: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	…
llimagejpeg.h	…
llimagepng.cpp	…
llimagepng.h	…
llimagetga.cpp	…
llimagetga.h	…
llimageworker.cpp	Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer	2022-06-18 15:53:35 +02:00
llimageworker.h	SL-17483: Per review feedback, avoid LLPointer refcount twiddling	2022-06-13 15:18:14 -04:00
llmapimagetype.h	…
llpngwrapper.cpp	…
llpngwrapper.h	…