Ansariel 355a80ab91 Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llimagej2coj/llimagej2coj.cpp # indra/newview/llfloaterworldmap.cpp # indra/newview/llfloaterworldmap.h # indra/newview/llviewertexturelist.cpp # indra/newview/skins/default/xui/en/floater_world_map.xml		2025-05-23 13:13:24 +02:00
..
CMakeLists.txt	Revert "Linux: Stop GCC complaining about deprecated functions in target llimagej2coj"	2023-02-05 18:34:46 +11:00
llimagej2coj.cpp	Merge branch 'develop' of https://github.com/secondlife/viewer	2025-05-23 13:13:24 +02:00
llimagej2coj.h	Fix and optimize openjpeg J2C encoder (#4017, #4032)	2025-05-06 15:26:35 +03:00