livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llfilesystem
History
Ansariel 1fc3aaff9b Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	.gitignore
#	autobuild.xml
#	indra/CMakeLists.txt
#	indra/cmake/00-Common.cmake
#	indra/cmake/Boost.cmake
#	indra/cmake/BuildVersion.cmake
#	indra/cmake/CEFPlugin.cmake
#	indra/cmake/CMakeLists.txt
#	indra/cmake/CURL.cmake
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/DBusGlib.cmake
#	indra/cmake/DragDrop.cmake
#	indra/cmake/FMODSTUDIO.cmake
#	indra/cmake/FindHUNSPELL.cmake
#	indra/cmake/FindJsonCpp.cmake
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/FindURIPARSER.cmake
#	indra/cmake/FreeType.cmake
#	indra/cmake/GLH.cmake
#	indra/cmake/Hunspell.cmake
#	indra/cmake/JsonCpp.cmake
#	indra/cmake/LLKDU.cmake
#	indra/cmake/LLPhysicsExtensions.cmake
#	indra/cmake/LLPlugin.cmake
#	indra/cmake/LLWindow.cmake
#	indra/cmake/Linking.cmake
#	indra/cmake/MESHOPTIMIZER.cmake
#	indra/cmake/MediaPluginBase.cmake
#	indra/cmake/NGHTTP2.cmake
#	indra/cmake/OPENAL.cmake
#	indra/cmake/OpenGL.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/cmake/OpenSSL.cmake
#	indra/cmake/PNG.cmake
#	indra/cmake/Tracy.cmake
#	indra/cmake/UI.cmake
#	indra/cmake/Variables.cmake
#	indra/cmake/ViewerMiscLibs.cmake
#	indra/cmake/ZLIBNG.cmake
#	indra/cmake/bugsplat.cmake
#	indra/integration_tests/llui_libtest/CMakeLists.txt
#	indra/linux_crash_logger/CMakeLists.txt
#	indra/llaudio/CMakeLists.txt
#	indra/llcommon/CMakeLists.txt
#	indra/llcommon/llapp.cpp
#	indra/llcorehttp/CMakeLists.txt
#	indra/llimagej2coj/CMakeLists.txt
#	indra/llinventory/CMakeLists.txt
#	indra/llmath/CMakeLists.txt
#	indra/llmath/llcalcparser.h
#	indra/llmessage/CMakeLists.txt
#	indra/llprimitive/CMakeLists.txt
#	indra/llrender/CMakeLists.txt
#	indra/llrender/llglslshader.cpp
#	indra/llwindow/CMakeLists.txt
#	indra/media_plugins/CMakeLists.txt
#	indra/media_plugins/base/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llxmlrpclistener.cpp
#	indra/newview/llxmlrpctransaction.cpp
#	indra/newview/viewer_manifest.py
#	indra/test/CMakeLists.txt
 		2022-09-17 23:12:34 +02:00
..
tests Revert revert of Simplified Cache viewer release - continue with simplified cache 2021-03-10 15:13:12 +01:00
CMakeLists.txt Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically 2022-05-01 00:38:40 +02:00
lldir.cpp don't warn when LL_PATH_NONE was deliberately selected 2022-02-12 20:26:22 +00:00
lldir.h Merge branch 'master' into DRTVWR-519 2021-11-16 01:21:05 +02:00
lldir_linux.cpp Revert revert of Simplified Cache viewer release - continue with simplified cache 2021-03-10 15:13:12 +01:00
lldir_linux.h Revert revert of Simplified Cache viewer release - continue with simplified cache 2021-03-10 15:13:12 +01:00
lldir_mac.cpp Revert revert of Simplified Cache viewer release - continue with simplified cache 2021-03-10 15:13:12 +01:00
lldir_mac.h Revert revert of Simplified Cache viewer release - continue with simplified cache 2021-03-10 15:13:12 +01:00
lldir_utils_objc.h Revert revert of Simplified Cache viewer release - continue with simplified cache 2021-03-10 15:13:12 +01:00
lldir_utils_objc.mm Revert revert of Simplified Cache viewer release - continue with simplified cache 2021-03-10 15:13:12 +01:00
lldir_win32.cpp Revert revert of Simplified Cache viewer release - continue with simplified cache 2021-03-10 15:13:12 +01:00
lldir_win32.h Revert revert of Simplified Cache viewer release - continue with simplified cache 2021-03-10 15:13:12 +01:00
lldirguard.h Revert revert of Simplified Cache viewer release - continue with simplified cache 2021-03-10 15:13:12 +01:00
lldiriterator.cpp Merge branch 'master' into DRTVWR-519 2021-11-16 01:21:05 +02:00
lldiriterator.h Revert revert of Simplified Cache viewer release - continue with simplified cache 2021-03-10 15:13:12 +01:00
lldiskcache.cpp Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-01-12 16:46:56 +01:00
lldiskcache.h Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-01-12 16:46:56 +01:00
llfilesystem.cpp Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-12-16 09:49:35 +01:00
llfilesystem.h Revert revert of Simplified Cache viewer release - continue with simplified cache 2021-03-10 15:13:12 +01:00
lllfsthread.cpp Revert revert of Simplified Cache viewer release - continue with simplified cache 2021-03-10 15:13:12 +01:00
lllfsthread.h Revert revert of Simplified Cache viewer release - continue with simplified cache 2021-03-10 15:13:12 +01:00