phoenix-firestorm/indra/llplugin
Andrey Lihatskiy 85f2447b3d Merge branch 'main' into marchcat/a-merge
# Conflicts:
#	autobuild.xml
#	indra/llimage/llimage.cpp
#	indra/llui/llsearcheditor.cpp
#	indra/llui/llview.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloatercamera.cpp
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpanelgroupbulkban.cpp
#	indra/newview/llsidepanelappearance.cpp
#	indra/newview/llvovolume.cpp
2024-04-24 19:28:15 +03:00
..
slplugin Remove orphaned 32bit Windows code from slplugin.cpp 2024-02-20 02:14:01 +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 llplugin: BOOL (int) to real bool 2024-02-12 23:17:22 +02:00
llpluginclassmedia.h replace boost library to standard 2024-01-08 23:29:21 +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 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llplugininstance.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llpluginmessage.cpp remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llpluginmessage.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
llpluginmessageclasses.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
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 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
llpluginprocessparent.cpp SL-18801 Crash at LLPluginProcessParent::pollTick() 2022-12-07 19:33:47 +02:00
llpluginprocessparent.h replace boost library to standard 2024-01-08 23:29:21 +02:00
llpluginsharedmemory.cpp llplugin: BOOL (int) to real bool 2024-02-12 23:17:22 +02:00
llpluginsharedmemory.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00