livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,845 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 f65cddf860 Merge branch 'contribute' of https://github.com/secondlife/viewer 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/lluuid.cpp
#	indra/llcommon/lluuid.h
#	indra/llprimitive/llmodel.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/llfilepicker.h
#	indra/newview/llfilepicker_mac.h
#	indra/newview/llfilepicker_mac.mm
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llviewerwearable.h
#	indra/newview/skins/default/xui/da/floater_about.xml
#	indra/newview/skins/default/xui/da/floater_fs_voice_controls.xml
#	indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
#	indra/newview/skins/default/xui/de/floater_about.xml
#	indra/newview/skins/default/xui/de/floater_perm_prefs.xml
#	indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml
#	indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
#	indra/newview/skins/default/xui/en/floater_about.xml
#	indra/newview/skins/default/xui/en/strings.xml
#	indra/newview/skins/default/xui/es/floater_about.xml
#	indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml
#	indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
#	indra/newview/skins/default/xui/fr/floater_about.xml
#	indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
#	indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml
#	indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml
#	indra/newview/skins/default/xui/it/floater_about.xml
#	indra/newview/skins/default/xui/it/floater_perm_prefs.xml
#	indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml
#	indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
#	indra/newview/skins/default/xui/ja/floater_fs_voice_controls.xml
#	indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
#	indra/newview/skins/default/xui/pl/floater_about.xml
#	indra/newview/skins/default/xui/pl/floater_about_land.xml
#	indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml
#	indra/newview/skins/default/xui/pl/floater_associate_listing.xml
#	indra/newview/skins/default/xui/pl/notifications.xml
#	indra/newview/skins/default/xui/pl/panel_group_creation_sidetray.xml
#	indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/pl/panel_outfit_snapshot_inventory.xml
#	indra/newview/skins/default/xui/pl/panel_profile_firstlife.xml
#	indra/newview/skins/default/xui/pl/panel_profile_pick.xml
#	indra/newview/skins/default/xui/pl/panel_profile_picks.xml
#	indra/newview/skins/default/xui/pl/panel_profile_secondlife.xml
#	indra/newview/skins/default/xui/pl/panel_region_access.xml
#	indra/newview/skins/default/xui/pl/panel_script_experience.xml
#	indra/newview/skins/default/xui/pl/strings.xml
#	indra/newview/skins/default/xui/pt/floater_about.xml
#	indra/newview/skins/default/xui/pt/floater_fs_voice_controls.xml
#	indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
#	indra/newview/skins/default/xui/ru/floater_about.xml
#	indra/newview/skins/default/xui/ru/floater_perm_prefs.xml
#	indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml
#	indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml
#	indra/newview/skins/default/xui/tr/floater_about.xml
#	indra/newview/skins/default/xui/tr/floater_fs_voice_controls.xml
#	indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml
#	indra/newview/skins/default/xui/zh/floater_about.xml
#	indra/newview/skins/default/xui/zh/floater_fs_voice_controls.xml
#	indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
 		2023-03-01 12:54:24 +01:00
.github Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-03-01 12:54:24 +01:00
doc Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-03-01 12:54:24 +01:00
etc Merge axon 2017-09-20 01:09:14 +02:00
fsutils Add Beta channel build support 2023-01-20 22:49:07 +00:00
indra Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-03-01 12:54:24 +01:00
scripts Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-01-13 15:19:29 +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 Minor gitignore cleanup 2023-01-23 10:36:00 +00:00
.pre-commit-config.yaml SL-15741: Add pre-commit configuration 2022-01-24 18:47:10 +02:00
BuildParams Merge branch 'SL-15742' into DRTVWR-527-maint 2021-12-16 00:58:44 +02:00
FIRESTORM-SOURCE_LICENSE_HEADER.txt Flip dates to 2023 2023-01-02 19:19:28 +01:00
LICENSE Renamed LICENSE.txt to follow naming scheme of other repos 2022-11-18 17:10:03 -05: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 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 'contribute' of https://github.com/secondlife/viewer 2023-03-01 12:54:24 +01:00
build.sh Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 21:01:05 +01:00
build_target.sh Add simple script to allow parallel build of OS/SL 2020-10-10 01:39:14 +01:00
requirements.txt Extend GHA for Release builds (with Mac Codesigning) 2022-12-17 16:00:04 +00:00