livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
66,129 Commits
2 Branches
0 Tags
319 MiB
C++ 86.4%
R 8%
GLSL 1.7%
HTML 1%
Python 0.9%
Other 1.9%
 
 
 
 
 
 
Go to file
Ansariel f990515d35 Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloaterhoverheight.cpp
#	indra/newview/llfloatermap.cpp
#	indra/newview/llfloatermap.h
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llnetmap.h
#	indra/newview/llworldmapview.cpp
#	indra/newview/skins/default/colors.xml
#	indra/newview/skins/default/xui/en/menu_mini_map.xml
 		2022-04-19 21:50:14 +02:00
doc Merge branch 'DRTVWR-553-maint-mix-JK' of https://bitbucket.org/lindenlab/viewer 2022-02-02 10:37:33 +01:00
etc
…
indra Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 2022-04-19 21:50:14 +02:00
scripts Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 08:38:19 +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 FIRE-31326 - Fix crash thread contention crash 2022-01-30 15:48:16 +00:00
.pre-commit-config.yaml SL-15741: Add pre-commit configuration 2022-03-08 19:25:02 +00:00
BuildParams Merge branch 'SL-15742' into DRTVWR-527-maint 2021-12-16 00:58:44 +02:00
FIRESTORM-SOURCE_LICENSE_HEADER.txt It's 2022... 2021-12-31 14:42:20 +01:00
README_BUILD_FIRESTORM_LINUX.txt Add example for using multithreaded xz compression to linux build instructions 2022-02-15 17:10:52 +01:00
README_BUILD_FIRESTORM_MACOSX.txt
…
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://bitbucket.org/lindenlab/viewer 2022-04-19 00:23:41 +02:00
build.sh Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer 2021-09-20 13:16:41 +02:00
build_target.sh Add simple script to allow parallel build of OS/SL 2020-10-10 01:39:14 +01:00