Ansariel 0a83a1e6b7 Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/newview/llagentbenefits.cpp # indra/newview/llagentbenefits.h # indra/newview/llfloatersidepanelcontainer.h # indra/newview/llfloatersnapshot.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llpanelsnapshot.cpp # indra/newview/llpanelsnapshotinventory.cpp # indra/newview/llpanelsnapshotoptions.cpp # indra/newview/llpreviewscript.cpp # indra/newview/llsnapshotlivepreview.cpp		2024-07-18 20:04:45 +02:00
..
CMakeLists.txt	…
llimagej2coj.cpp	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-07-18 20:04:45 +02:00
llimagej2coj.h	…