Ansariel 750099db68 Merge branch 'release/2025.03' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llmessage/llproxy.cpp # indra/llui/llfolderviewitem.cpp # indra/newview/CMakeLists.txt # indra/newview/llappviewer.cpp # indra/newview/llfilepicker.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llviewerprecompiledheaders.h # indra/newview/llviewerwindow.cpp # indra/newview/skins/default/xui/en/floater_world_map.xml # indra/newview/skins/default/xui/en/menu_viewer.xml # indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml # indra/newview/viewer_manifest.py		2025-03-12 19:31:51 +01:00
..
tests	Fix line endlings	2024-05-22 22:40:26 +03:00
CMakeLists.txt	Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically	2022-05-01 00:38:40 +02:00
llcontrol.cpp	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-07-03 01:11:47 +02:00
llcontrol.h	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-08-15 00:12:13 +02:00
llxmlnode.cpp	Merge branch 'release/2025.03' of https://github.com/secondlife/viewer	2025-03-05 10:12:03 +01:00
llxmlnode.h	viewer#2972 Fix viewer stripping quotes off folder names	2024-10-30 18:34:04 +02:00
llxmlparser.cpp	Fix line endlings	2024-05-22 22:40:26 +03:00
llxmlparser.h	Fix line endlings	2024-05-22 22:40:26 +03:00
llxmltree.cpp	Merge branch 'release/2025.03' of https://github.com/secondlife/viewer	2025-03-12 19:31:51 +01:00
llxmltree.h	Fix line endlings	2024-05-22 22:40:26 +03:00