Ansariel 6ccdf5545d Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 ... # Conflicts: # autobuild.xml # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp		2022-05-27 11:41:45 +02:00
..
tests	SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton	2021-10-28 18:06:21 +00:00
CMakeLists.txt	Merge branch 'master' into DRTVWR-543-maint	2021-12-26 14:01:17 +02:00
llimage.cpp	Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer	2022-03-08 16:20:47 +01:00
llimage.h	Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer	2022-02-16 10:54:59 +01:00
llimagebmp.cpp	…
llimagebmp.h	…
llimagedimensionsinfo.cpp	…
llimagedimensionsinfo.h	…
llimagedxt.cpp	…
llimagedxt.h	…
llimagefilter.cpp	…
llimagefilter.h	…
llimagej2c.cpp	Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer	2021-11-12 17:31:39 +01: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-546' of https://bitbucket.org/lindenlab/viewer	2022-01-15 02:39:07 +01:00
llimageworker.h	…
llmapimagetype.h	…
llpngwrapper.cpp	…
llpngwrapper.h	…