livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llvfs
History
Andrey Lihatskiy b18f328c08 Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix 
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llmachineid.cpp
 		2021-09-03 00:18:26 +03:00
..
tests Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
CMakeLists.txt Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
lldir.cpp Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix 2021-09-03 00:18:26 +03:00
lldir.h Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix 2021-09-03 00:18:26 +03:00
lldir_linux.cpp Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
lldir_linux.h Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
lldir_mac.cpp Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
lldir_mac.h Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
lldir_win32.cpp Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
lldir_win32.h Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
lldirguard.h Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
lldiriterator.cpp Merge branch 'master' into DRTVWR-522-maint 2021-03-09 22:00:08 +02:00
lldiriterator.h Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
lllfsthread.cpp Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
lllfsthread.h Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
llpidlock.cpp Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
llpidlock.h Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
llvfile.cpp Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
llvfile.h Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
llvfs.cpp Merge branch 'master' v6.4.17 into DRTVWR-525 2021-03-10 09:34:16 -07:00
llvfs.h Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
llvfs_objc.h Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
llvfs_objc.mm Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
llvfsthread.cpp Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00
llvfsthread.h Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08 13:56:16 +00:00