phoenix-firestorm/indra
Ansariel 1537c9ed2c Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llmessage/message_prehash.cpp
#	indra/newview/llimprocessing.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llimview.h
#	indra/newview/skins/default/xui/de/strings.xml
#	indra/newview/skins/default/xui/en/strings.xml
#	indra/newview/skins/default/xui/es/strings.xml
#	indra/newview/skins/default/xui/fr/strings.xml
#	indra/newview/skins/default/xui/it/strings.xml
#	indra/newview/skins/default/xui/ja/strings.xml
#	indra/newview/skins/default/xui/pl/strings.xml
#	indra/newview/skins/default/xui/pt/strings.xml
2025-03-28 15:07:17 +01:00
..
cmake
copy_win_scripts
doxygen
integration_tests
lib/python/indra
linux_crash_logger
llappearance
llaudio
llcharacter Revert "tentative workaround for gcc c++20 std::lerp clash" 2025-03-08 23:46:30 +01:00
llcommon Revert "tentative workaround for gcc c++20 std::lerp clash" 2025-03-08 23:46:30 +01:00
llcorehttp
llcrashlogger
llfilesystem
llimage
llimagej2coj
llinventory Merge branch 'develop' of https://github.com/secondlife/viewer 2025-03-28 15:07:17 +01:00
llkdu
llmath [FIRE-35081] - Fixed blurry textures and scaling issues 2025-03-12 00:32:16 +00:00
llmeshoptimizer
llmessage Merge branch 'develop' of https://github.com/secondlife/viewer 2025-03-28 15:07:17 +01:00
llplugin
llprimitive Merge branch 'develop' of https://github.com/secondlife/viewer 2025-03-08 12:59:32 +01:00
llrender FIRE-35081 - Handled animated/media textures, grass, tree and light textures 2025-03-17 23:13:41 -03:00
llui Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-03-28 14:41:36 +01:00
llwebrtc
llwindow Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-03-07 17:19:04 +01:00
llxml
mac_crash_logger
media_plugins
newview Merge branch 'develop' of https://github.com/secondlife/viewer 2025-03-28 15:07:17 +01:00
test
tools
viewer_components Fix xcode16 build errors 2025-02-13 17:30:08 +02:00
win_crash_logger
CMakeLists.txt Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer 2025-02-13 21:24:29 +01:00
Version
edit-me-to-trigger-new-build.txt