phoenix-firestorm/indra
Ansariel e9b6550c48 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llfilesystem/llfilesystem.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/lltextureview.cpp
#	indra/newview/llviewertexture.h
#	indra/newview/llviewertexturelist.cpp
2024-07-06 11:06:55 +02:00
..
cmake Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-02 18:08:57 +02:00
copy_win_scripts
doxygen
integration_tests
lib/python/indra
linux_crash_logger
llappearance
llaudio
llcharacter
llcommon Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-03 01:11:47 +02:00
llcorehttp
llcrashlogger
llfilesystem Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-06 11:06:55 +02:00
llimage Fix texture fetch request getting canceled if request counter flips over 2024-06-22 14:53:16 +02:00
llimagej2coj
llinventory
llkdu
llmath Merge branch 'develop' of https://github.com/secondlife/viewer 2024-06-21 19:46:51 +02:00
llmeshoptimizer
llmessage Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-06 11:06:55 +02:00
llplugin
llprimitive
llrender Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-06 11:06:55 +02:00
llui Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-03 01:11:47 +02:00
llwebrtc Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-02 18:08:57 +02:00
llwindow Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-03 01:11:47 +02:00
llxml Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-03 01:11:47 +02:00
mac_crash_logger
media_plugins
newview Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-06 11:06:55 +02:00
test
tools
viewer_components #1111 Remove xmlrpc-epi 2024-07-01 20:20:04 +02:00
win_crash_logger
CMakeLists.txt
Version
edit-me-to-trigger-new-build.txt