Ansariel 591c75ebaf Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llappearance/llavatarappearance.cpp # indra/llmath/llvolume.cpp # indra/llmessage/llcorehttputil.cpp # indra/llrender/llgl.cpp # indra/newview/installers/darwin/apple-notarize.sh # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llfloater360capture.cpp # indra/newview/llfloateremojipicker.cpp # indra/newview/llpanelpeople.cpp # indra/newview/llviewertexture.cpp # indra/newview/viewer_manifest.py		2024-06-10 21:53:31 +02:00
..
python/indra	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-06-10 21:53:31 +02:00