phoenix-firestorm/indra
Ansariel 5c03f284af Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/cmake/APR.cmake
#	indra/cmake/LLPhysicsExtensions.cmake
#	indra/newview/llsurface.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
#	indra/newview/viewer_manifest.py
2025-10-18 13:01:08 +02:00
..
cmake Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-18 13:01:08 +02:00
copy_win_scripts
doxygen
integration_tests
lib/python/indra
linux_crash_logger
llappearance
llaudio
llcharacter
llcommon Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202507 2025-10-18 12:44:12 +02:00
llconvexdecomposition Initial VHACD based llconvexdecomposition 2025-10-03 09:51:03 -04:00
llcorehttp
llcrashlogger
llfilesystem Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-11 14:41:58 +02:00
llimage Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-18 12:33:24 +02:00
llimagej2coj
llinventory #4772 fix group ownership detection for deeded objects (FS:TJ- Fixes issue FIRE-35983) 2025-10-10 04:27:49 +10:00
llkdu
llmath Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-11 18:51:03 +02:00
llmeshoptimizer
llmessage Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-11 18:51:03 +02:00
llplugin
llprimitive Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-11 18:51:03 +02:00
llrender Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-18 12:33:24 +02:00
llui Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-18 13:01:08 +02:00
llwebrtc Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2025-10-18 12:33:24 +02:00
llwindow Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-202507 2025-10-18 12:44:12 +02:00
llxml
mac_crash_logger
media_plugins
newview Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-18 13:01:08 +02:00
test
tools/manifests
viewer_components
win_crash_logger
CMakeLists.txt Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-11 18:51:03 +02:00
Version