Ansariel 82b05f1063 Merge branch 'release/2025.04' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llui/llfloater.h # indra/newview/llfloatersnapshot.h # indra/newview/llstatusbar.cpp # indra/newview/llviewerwindow.cpp # indra/newview/skins/default/xui/da/floater_about.xml # indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml # indra/newview/skins/default/xui/de/strings.xml # indra/newview/skins/default/xui/en/floater_snapshot.xml # indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml # indra/newview/skins/default/xui/en/panel_tools_texture.xml # indra/newview/skins/default/xui/es/strings.xml # indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml # indra/newview/skins/default/xui/fr/strings.xml # indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml # indra/newview/skins/default/xui/it/strings.xml # indra/newview/skins/default/xui/ja/panel_settings_water.xml # indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml # indra/newview/skins/default/xui/ja/strings.xml # indra/newview/skins/default/xui/pt/strings.xml # indra/newview/skins/default/xui/ru/strings.xml # indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml # indra/newview/skins/default/xui/zh/strings.xml # scripts/messages/message_template.msg # scripts/messages/message_template.msg.sha1		2025-03-31 23:55:28 +02:00
..
cmake	Merge branch 'release/2025.03' of https://github.com/secondlife/viewer	2025-03-12 19:31:51 +01:00
copy_win_scripts	…
doxygen	…
integration_tests	…
lib/python/indra	…
linux_crash_logger	…
llappearance	Merge branch 'release/2025.03' of https://github.com/secondlife/viewer	2025-03-12 19:31:51 +01:00
llaudio	Merge branch 'release/2025.03' of https://github.com/secondlife/viewer	2025-03-08 13:15:21 +01:00
llcharacter	Revert "tentative workaround for gcc c++20 std::lerp clash"	2025-03-08 23:46:30 +01:00
llcommon	Merge branch 'release/2025.04' of https://github.com/secondlife/viewer	2025-03-31 23:55:28 +02:00
llcorehttp	…
llcrashlogger	…
llfilesystem	…
llimage	#3809 Partial revert of "Fix J2C Upload"	2025-03-31 17:44:20 +03:00
llimagej2coj	…
llinventory	Revert "tentative workaround for gcc c++20 std::lerp clash"	2025-03-08 23:46:30 +01:00
llkdu	…
llmath	Merge branch 'release/2025.03' of https://github.com/secondlife/viewer	2025-03-12 19:31:51 +01:00
llmeshoptimizer	…
llmessage	Merge branch 'release/2025.03' of https://github.com/secondlife/viewer	2025-03-19 15:23:20 +01:00
llplugin	Merge branch 'release/2025.03' of https://github.com/secondlife/viewer	2025-03-08 13:15:21 +01:00
llprimitive	Merge branch 'release/2025.04' of https://github.com/secondlife/viewer	2025-03-31 23:55:28 +02:00
llrender	Merge branch 'release/2025.03' of https://github.com/secondlife/viewer	2025-03-12 19:31:51 +01:00
llui	Merge branch 'release/2025.04' of https://github.com/secondlife/viewer	2025-03-31 23:55:28 +02:00
llwebrtc	…
llwindow	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2025-03-07 17:19:04 +01:00
llxml	Merge branch 'release/2025.03' of https://github.com/secondlife/viewer	2025-03-12 19:31:51 +01:00
mac_crash_logger	…
media_plugins	…
newview	Merge branch 'release/2025.04' of https://github.com/secondlife/viewer	2025-03-31 23:55:28 +02:00
test	Merge branch 'release/2025.03' of https://github.com/secondlife/viewer	2025-03-12 19:31:51 +01:00
tools	…
viewer_components	…
win_crash_logger	…
CMakeLists.txt	…
Version	…
edit-me-to-trigger-new-build.txt	…