Ansariel 64b6587eec Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llinventoryfilter.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelobjectinventory.cpp # indra/newview/llviewerregion.cpp # indra/newview/llworldmapview.cpp # indra/newview/skins/default/xui/en/floater_tools.xml # indra/newview/skins/default/xui/en/menu_viewer.xml		2024-09-09 19:48:04 +02:00
..
tests	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-05-22 20:27:05 +02:00
CMakeLists.txt	…
llimage.cpp	Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600	2024-06-13 01:54:18 +02:00
llimage.h	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-07-18 20:04:45 +02:00
llimagebmp.cpp	Fix line endlings	2024-05-22 22:40:26 +03:00
llimagebmp.h	Fix line endlings	2024-05-22 22:40:26 +03:00
llimagedimensionsinfo.cpp	Fix line endlings	2024-05-22 22:40:26 +03:00
llimagedimensionsinfo.h	…
llimagedxt.cpp	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-06-11 19:04:21 +02:00
llimagedxt.h	…
llimagefilter.cpp	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-07-09 02:25:42 +02:00
llimagefilter.h	…
llimagej2c.cpp	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-09-09 19:48:04 +02:00
llimagej2c.h	Clean up boost includes and remove compiler warning pragma for unreachable code in PCH (#2361)	2024-08-20 18:41:48 +03:00
llimagejpeg.cpp	Fix line endlings	2024-05-22 22:40:26 +03:00
llimagejpeg.h	Enable /permissive- on MSVC for better standards conformance (#2251)	2024-08-14 08:01:02 -07:00
llimagepng.cpp	Fix line endlings	2024-05-22 22:40:26 +03:00
llimagepng.h	…
llimagetga.cpp	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-06-10 21:53:31 +02:00
llimagetga.h	…
llimageworker.cpp	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-06-21 22:45:12 +02:00
llimageworker.h	Fix line endlings	2024-05-22 22:40:26 +03:00
llmapimagetype.h	…
llpngwrapper.cpp	Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings	2024-06-01 15:49:26 +02:00
llpngwrapper.h	Fix line endlings	2024-05-22 22:40:26 +03:00