Ansariel 44ccbea344 Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/character/avatar_lad.xml # indra/newview/llappviewer.cpp # indra/newview/lldynamictexture.cpp # indra/newview/llface.cpp # indra/newview/llmeshrepository.cpp # indra/newview/llviewermessage.cpp # indra/newview/llvoavatar.cpp		2024-09-17 18:12:46 +02:00
..
slplugin	…
CMakeLists.txt	…
llpluginclassmedia.cpp	…
llpluginclassmedia.h	…
llpluginclassmediaowner.h	…
llplugininstance.cpp	…
llplugininstance.h	…
llpluginmessage.cpp	…
llpluginmessage.h	…
llpluginmessageclasses.h	…
llpluginmessagepipe.cpp	…
llpluginmessagepipe.h	…
llpluginprocesschild.cpp	…
llpluginprocesschild.h	…
llpluginprocessparent.cpp	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-09-17 18:12:46 +02:00
llpluginprocessparent.h	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-07-22 20:58:53 +02:00
llpluginsharedmemory.cpp	…
llpluginsharedmemory.h	…