Files
Ansariel c4333e2222 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llinventory/llsettingssky.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/skins/default/xui/en/floater_world_map.xml
2025-06-16 12:55:12 +02:00
..
2021-03-09 10:40:01 +01:00
2023-04-05 13:14:08 +02:00
2022-04-16 14:21:26 +02:00
2024-05-20 13:22:55 -05:00
2021-03-09 10:40:01 +01:00
2025-06-10 14:15:57 -04:00
2024-07-01 20:20:04 +02:00
2025-05-07 18:51:57 +03:00