phoenix-firestorm/indra
Ansariel f3bce39d28 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llfile.cpp
#	indra/llui/llviewereventrecorder.cpp
2025-10-21 00:24:37 +02:00
..
cmake Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-20 23:56:48 +02:00
copy_win_scripts
doxygen
integration_tests
lib/python/indra
linux_crash_logger
llappearance Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-20 23:56:48 +02:00
llaudio
llcharacter
llcommon Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-21 00:24:37 +02:00
llcorehttp
llcrashlogger Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-21 00:24:37 +02:00
llfilesystem Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-21 00:24:37 +02:00
llimage Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-21 00:24:37 +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
llphysicsextensionsos Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-20 23:56:48 +02:00
llplugin Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-20 23:56:48 +02:00
llprimitive Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-20 23:56:48 +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-21 00:24:37 +02:00
llwebrtc Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master 2025-10-18 13:02:10 +02:00
llwindow Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-20 23:56:48 +02:00
llxml
mac_crash_logger
media_plugins
newview Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-21 00:24:37 +02:00
test
tools/manifests
viewer_components
win_crash_logger
CMakeLists.txt Merge branch 'develop' of https://github.com/secondlife/viewer 2025-10-20 23:56:48 +02:00
Version