livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
65,140 Commits
2 Branches
0 Tags
297 MiB
C++ 86.3%
R 8.1%
GLSL 1.7%
HTML 1.1%
Python 0.8%
Other 1.9%
 
 
 
 
 
 
Go to file
Ansariel 7427b46ea5 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	.gitignore
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/llcommon/llcommon.cpp
#	indra/llcommon/llerror.cpp
#	indra/llcommon/llprofiler.h
#	indra/llcommon/llthread.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llprimitive/llmodel.h
#	indra/llrender/llfontgl.cpp
#	indra/llrender/llfontgl.h
#	indra/llrender/llgl.cpp
#	indra/llrender/llvertexbuffer.cpp
#	indra/llrender/llvertexbuffer.h
#	indra/llwindow/llwindowmacosx.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/lldrawpoolavatar.h
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llmeshrepository.h
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llskinningutil.cpp
#	indra/newview/llskinningutil.h
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llteleporthistory.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvoicevivox.cpp
#	indra/newview/llvosky.cpp
#	indra/newview/llvovolume.cpp
 		2021-11-12 15:21:52 +01:00
debian try to suppress some debian errors we don't care about 2015-11-10 09:55:05 -05:00
doc Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-12 15:21:52 +01:00
etc Merge axon 2017-09-20 01:09:14 +02:00
indra Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-12 15:21:52 +01:00
scripts Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-12 15:21:52 +01:00
.clang-format DRTVWR-497 tweak clang-format rules for argument packing 2020-08-24 13:52:57 -06:00
.gitattributes More line ending normalization madness 2020-01-16 09:35:33 +01:00
.gitignore Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2021-11-12 15:21:52 +01:00
BuildParams SL-10297: Modify LL_ERRS and other deliberate crashes to avoid a common stack frame 2019-01-16 11:05:55 -05:00
FIRESTORM-SOURCE_LICENSE_HEADER.txt It's 2021... 2021-01-03 23:35:35 +01:00
README_BUILD_FIRESTORM_LINUX.txt - Remove section about building viewer-development as LL long ago gave up on Linux. 2021-02-25 21:34:58 +01:00
README_BUILD_FIRESTORM_MACOSX.txt tip to default branch. 2014-12-12 09:36:00 +01:00
README_BUILD_FIRESTORM_WINDOWS.txt Update configure script and Windows readme file for VS2017 tools update 2020-07-24 00:20:08 +02:00
autobuild.xml Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-10-28 12:48:13 +02:00
build.sh Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-10-28 12:48:13 +02:00
build_target.sh Add simple script to allow parallel build of OS/SL 2020-10-10 01:39:14 +01:00