Ansariel 40b731eb76 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568 ... # Conflicts: # .gitignore # indra/cmake/FindOpenJPEG.cmake # indra/cmake/FreeType.cmake # indra/cmake/OpenJPEG.cmake # indra/cmake/UI.cmake # indra/cmake/ViewerMiscLibs.cmake # indra/llwindow/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/viewer_manifest.py		2023-03-21 10:57:56 +01:00
..
slplugin	Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer	2022-09-17 23:12:34 +02:00
CMakeLists.txt	Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically	2022-05-01 00:38:40 +02:00
llpluginclassmedia.cpp	Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer	2022-01-11 15:04:11 +01:00
llpluginclassmedia.h	Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer	2022-05-05 10:00:17 +02:00
llpluginclassmediaowner.h	Fixes for 'MAINT-8196 Remove LLPluginCookieStore from the viewer' and 'MAINT-8194 Remove per-frame calls to updateJavascriptObject()'	2018-01-17 16:13:19 -08:00
llplugininstance.cpp	…
llplugininstance.h	…
llpluginmessage.cpp	…
llpluginmessage.h	…
llpluginmessageclasses.h	…
llpluginmessagepipe.cpp	SL-10291 Replace apr_mutex with standard C++11 functionality	2019-01-14 22:04:44 +02:00
llpluginmessagepipe.h	DRTVWR-494: Use std:🧵:id for LLThread::currentID().	2020-03-25 15:28:17 -04:00
llpluginprocesschild.cpp	SL-3704 Give plugins some time to terminate	2020-08-10 20:44:52 +03:00
llpluginprocesschild.h	…
llpluginprocessparent.cpp	Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer	2023-01-12 16:56:08 +01:00
llpluginprocessparent.h	Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer	2021-08-24 10:47:18 +02:00
llpluginsharedmemory.cpp	Undo Linux updates.	2021-03-09 10:40:01 +01:00
llpluginsharedmemory.h	…