phoenix-firestorm/indra
Ansariel 8758495d11 Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llerror.cpp
#	indra/llmath/v4math.h
#	indra/llui/lltransutil.cpp
#	indra/newview/llface.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/llvovolume.cpp
2025-01-26 00:07:35 +01:00
..
cmake
copy_win_scripts
doxygen
integration_tests
lib/python/indra
linux_crash_logger
llappearance
llaudio
llcharacter
llcommon Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer 2025-01-26 00:07:35 +01:00
llcorehttp
llcrashlogger
llfilesystem
llimage
llimagej2coj
llinventory Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer 2025-01-26 00:07:35 +01:00
llkdu
llmath Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer 2025-01-26 00:07:35 +01:00
llmeshoptimizer
llmessage
llplugin
llprimitive
llrender Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer 2025-01-26 00:07:35 +01:00
llui Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer 2025-01-26 00:07:35 +01:00
llwebrtc
llwindow Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer 2025-01-26 00:07:35 +01:00
llxml
mac_crash_logger
media_plugins
newview Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer 2025-01-26 00:07:35 +01:00
test
tools
viewer_components
win_crash_logger
CMakeLists.txt
Version
edit-me-to-trigger-new-build.txt