Ansariel 51f7e7a7d7 Merge branch 'release/2025.08' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llfloatermarketplace.cpp # indra/newview/llviewermessage.cpp # indra/newview/skins/default/xui/en/panel_preferences_move.xml		2025-11-17 23:37:55 +01:00
..
slplugin	Merge branch 'develop' of https://github.com/secondlife/viewer	2025-10-20 23:56:48 +02:00
CMakeLists.txt	Merge branch 'callum/viewer-cef-2025-08' into rye/infinitemac	2025-08-27 23:07:22 -04:00
llpluginclassmedia.cpp	Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer	2025-09-05 14:55:37 +02:00
llpluginclassmedia.h	Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer	2025-09-05 14:55:37 +02:00
llpluginclassmediaowner.h	…
llplugininstance.cpp	…
llplugininstance.h	…
llpluginmessage.cpp	…
llpluginmessage.h	…
llpluginmessageclasses.h	…
llpluginmessagepipe.cpp	…
llpluginmessagepipe.h	…
llpluginprocesschild.cpp	…
llpluginprocesschild.h	…
llpluginprocessparent.cpp	Merge branch 'release/2025.08' of https://github.com/secondlife/viewer	2025-11-17 23:37:55 +01:00
llpluginprocessparent.h	…
llpluginsharedmemory.cpp	…
llpluginsharedmemory.h	…