livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llplugin
History
Ansariel ca63f18bf2 Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmath/llvolume.cpp
#	indra/newview/llenvironment.cpp
#	indra/newview/llfetchedgltfmaterial.cpp
#	indra/newview/llfloaterimagepreview.h
#	indra/newview/llfloaterregioninfo.h
#	indra/newview/llmaniprotate.cpp
#	indra/newview/llselectmgr.h
#	indra/newview/llsurfacepatch.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoicevivox.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
#	scripts/messages/message_template.msg.sha1
 		2024-05-10 14:12:41 +02:00
..
slplugin Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-20 10:49:47 +01: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-600-maint-A' of https://github.com/secondlife/viewer 2024-02-13 00:54:24 +01:00
llpluginclassmedia.h Merge branch 'DRTVWR-599-maint-Z' of https://github.com/secondlife/viewer 2024-01-12 14:18:34 +01: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 Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-05-10 14:12:41 +02:00
llpluginprocessparent.h Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-05-10 14:12:41 +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