Ansariel 9a2b83b294 Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llcommon/llmemory.cpp # indra/llmessage/CMakeLists.txt # indra/llmessage/llfiltersd2xmlrpc.cpp # indra/newview/lldebugview.cpp # indra/newview/lldrawpoolbump.cpp # indra/newview/llheroprobemanager.cpp # indra/newview/llnetmap.cpp # indra/newview/llslurl.cpp # indra/newview/llsurface.cpp # indra/newview/lltextureview.cpp # indra/newview/llversioninfo.cpp # indra/newview/llviewertexture.cpp # indra/newview/llviewertexturelist.h # indra/newview/llviewerwindow.cpp # indra/newview/llvlcomposition.cpp # indra/newview/llvoiceclient.cpp # indra/newview/llworld.cpp # indra/newview/llxmlrpctransaction.cpp # indra/newview/skins/default/xui/da/floater_about.xml # indra/newview/skins/default/xui/de/floater_about.xml # indra/newview/skins/default/xui/de/menu_viewer.xml # indra/newview/skins/default/xui/en/floater_about.xml # indra/newview/skins/default/xui/es/floater_about.xml # indra/newview/skins/default/xui/es/menu_viewer.xml # indra/newview/skins/default/xui/fr/floater_about.xml # indra/newview/skins/default/xui/it/floater_about.xml # indra/newview/skins/default/xui/it/menu_viewer.xml # indra/newview/skins/default/xui/ja/menu_viewer.xml # indra/newview/skins/default/xui/pl/menu_viewer.xml # indra/newview/skins/default/xui/pt/floater_about.xml # indra/newview/skins/default/xui/pt/menu_viewer.xml # indra/newview/skins/default/xui/ru/floater_about.xml # indra/newview/skins/default/xui/ru/menu_viewer.xml # indra/newview/skins/default/xui/tr/floater_about.xml # indra/newview/skins/default/xui/tr/menu_viewer.xml # indra/newview/skins/default/xui/zh/floater_about.xml # indra/newview/skins/default/xui/zh/menu_viewer.xml # scripts/messages/message_template.msg.sha1		2024-07-02 18:08:57 +02:00
..
build.yaml	Pass through input channel to select the tag channel name	2024-06-17 17:55:29 -07:00
build_viewer.yml	[GHA] Add option to create Tracy builds on workflow triggers	2024-06-24 01:30:04 +01:00
cla.yaml	https://github.com/secondlife/viewer/issues/1214 - Update cla.yaml	2024-04-16 12:19:09 -04:00
label.yaml	Bump actions/labeler from 4 to 5	2024-04-03 16:11:02 +00:00
pre-commit.yaml	Bump actions/setup-python from 4 to 5	2024-04-03 16:14:34 +00:00
stale.yaml	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-06-10 21:53:31 +02:00
tag-release.yaml	Make sure TAG_ID actually gets added to GITHUB_ENV	2024-06-20 17:15:16 -07:00