Go to file
Ansariel 6ae8248f5d Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llinventory/llsettingssky.cpp
#	indra/llui/llfolderviewitem.h
#	indra/newview/llappviewer.cpp
#	indra/newview/skins/default/xui/de/floater_about_land.xml
#	indra/newview/skins/default/xui/de/floater_avatar_textures.xml
#	indra/newview/skins/default/xui/de/floater_camera.xml
#	indra/newview/skins/default/xui/de/floater_camera_presets.xml
#	indra/newview/skins/default/xui/de/floater_linkreplace.xml
#	indra/newview/skins/default/xui/de/floater_people.xml
#	indra/newview/skins/default/xui/de/floater_preferences_view_advanced.xml
#	indra/newview/skins/default/xui/de/floater_preview_trash.xml
#	indra/newview/skins/default/xui/de/floater_save_camera_preset.xml
#	indra/newview/skins/default/xui/de/menu_gallery_outfit_tab.xml
#	indra/newview/skins/default/xui/de/notifications.xml
#	indra/newview/skins/default/xui/de/panel_group_creation_sidetray.xml
#	indra/newview/skins/default/xui/de/panel_group_roles.xml
#	indra/newview/skins/default/xui/de/panel_login.xml
#	indra/newview/skins/default/xui/de/panel_notification_list_item.xml
#	indra/newview/skins/default/xui/de/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/de/panel_outfit_gallery_item.xml
#	indra/newview/skins/default/xui/de/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/de/panel_progress.xml
#	indra/newview/skins/default/xui/de/panel_region_environment.xml
#	indra/newview/skins/default/xui/de/strings.xml
#	indra/newview/skins/default/xui/de/teleport_strings.xml
#	indra/newview/skins/default/xui/es/floater_animation_anim_preview.xml
#	indra/newview/skins/default/xui/es/floater_animation_bvh_preview.xml
#	indra/newview/skins/default/xui/es/floater_camera.xml
#	indra/newview/skins/default/xui/es/floater_god_tools.xml
#	indra/newview/skins/default/xui/es/floater_people.xml
#	indra/newview/skins/default/xui/es/floater_tools.xml
#	indra/newview/skins/default/xui/es/menu_viewer.xml
#	indra/newview/skins/default/xui/es/notifications.xml
#	indra/newview/skins/default/xui/es/panel_group_roles.xml
#	indra/newview/skins/default/xui/es/panel_landmark_info.xml
#	indra/newview/skins/default/xui/es/panel_login.xml
#	indra/newview/skins/default/xui/es/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
#	indra/newview/skins/default/xui/es/strings.xml
#	indra/newview/skins/default/xui/es/teleport_strings.xml
#	indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
#	indra/newview/skins/default/xui/fr/floater_camera.xml
#	indra/newview/skins/default/xui/fr/floater_camera_presets.xml
#	indra/newview/skins/default/xui/fr/floater_forget_user.xml
#	indra/newview/skins/default/xui/fr/floater_linkreplace.xml
#	indra/newview/skins/default/xui/fr/floater_people.xml
#	indra/newview/skins/default/xui/fr/floater_preferences_view_advanced.xml
#	indra/newview/skins/default/xui/fr/floater_preview_trash.xml
#	indra/newview/skins/default/xui/fr/floater_save_camera_preset.xml
#	indra/newview/skins/default/xui/fr/menu_gallery_outfit_tab.xml
#	indra/newview/skins/default/xui/fr/menu_viewer.xml
#	indra/newview/skins/default/xui/fr/notifications.xml
#	indra/newview/skins/default/xui/fr/panel_group_creation_sidetray.xml
#	indra/newview/skins/default/xui/fr/panel_group_roles.xml
#	indra/newview/skins/default/xui/fr/panel_login.xml
#	indra/newview/skins/default/xui/fr/panel_notification_list_item.xml
#	indra/newview/skins/default/xui/fr/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/fr/panel_outfit_gallery_item.xml
#	indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
#	indra/newview/skins/default/xui/fr/panel_progress.xml
#	indra/newview/skins/default/xui/fr/panel_region_environment.xml
#	indra/newview/skins/default/xui/fr/strings.xml
#	indra/newview/skins/default/xui/fr/teleport_strings.xml
#	indra/newview/skins/default/xui/fr/widgets/density_ctrl.xml
#	indra/newview/skins/default/xui/it/floater_avatar_textures.xml
#	indra/newview/skins/default/xui/it/floater_camera.xml
#	indra/newview/skins/default/xui/it/floater_camera_presets.xml
#	indra/newview/skins/default/xui/it/floater_god_tools.xml
#	indra/newview/skins/default/xui/it/floater_media_browser.xml
#	indra/newview/skins/default/xui/it/floater_people.xml
#	indra/newview/skins/default/xui/it/floater_preferences_view_advanced.xml
#	indra/newview/skins/default/xui/it/floater_save_camera_preset.xml
#	indra/newview/skins/default/xui/it/floater_stats.xml
#	indra/newview/skins/default/xui/it/menu_login.xml
#	indra/newview/skins/default/xui/it/menu_viewer.xml
#	indra/newview/skins/default/xui/it/notifications.xml
#	indra/newview/skins/default/xui/it/panel_group_roles.xml
#	indra/newview/skins/default/xui/it/panel_landmark_info.xml
#	indra/newview/skins/default/xui/it/panel_login.xml
#	indra/newview/skins/default/xui/it/panel_notifications_channel.xml
#	indra/newview/skins/default/xui/it/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/it/panel_outfit_gallery_item.xml
#	indra/newview/skins/default/xui/it/panel_place_profile.xml
#	indra/newview/skins/default/xui/it/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/it/panel_prim_media_controls.xml
#	indra/newview/skins/default/xui/it/panel_region_environment.xml
#	indra/newview/skins/default/xui/it/sidepanel_appearance.xml
#	indra/newview/skins/default/xui/it/strings.xml
#	indra/newview/skins/default/xui/it/teleport_strings.xml
#	indra/newview/skins/default/xui/ja/floater_camera.xml
#	indra/newview/skins/default/xui/ja/floater_camera_presets.xml
#	indra/newview/skins/default/xui/ja/floater_people.xml
#	indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
#	indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml
#	indra/newview/skins/default/xui/ja/notifications.xml
#	indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
#	indra/newview/skins/default/xui/ja/panel_group_roles.xml
#	indra/newview/skins/default/xui/ja/panel_login.xml
#	indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
#	indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml
#	indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/ja/panel_region_environment.xml
#	indra/newview/skins/default/xui/ja/strings.xml
#	indra/newview/skins/default/xui/ja/teleport_strings.xml
#	indra/newview/skins/default/xui/ja/widgets/density_ctrl.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/pt/notifications.xml
#	indra/newview/skins/default/xui/pt/panel_group_roles.xml
#	indra/newview/skins/default/xui/pt/panel_landmark_info.xml
#	indra/newview/skins/default/xui/pt/panel_login.xml
#	indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/pt/strings.xml
2023-01-25 14:40:06 +01:00
.github Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-01-13 15:19:29 +01:00
doc Merge branch 'contribute' of https://github.com/secondlife/viewer 2023-01-13 15:19:29 +01:00
etc Merge axon 2017-09-20 01:09:14 +02:00
fsutils Refactor and improve to accept github zip archives and autounpack 2022-12-19 10:49:11 +00:00
indra Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer 2023-01-25 14:40:06 +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 ignore the compiled glsl files as these should not be in version control 2022-11-05 15:01:18 +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 Flip dates to 2023 2023-01-02 19:19:28 +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