Ansariel 8d154eaa8c Merge branch 'contribute' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llappearance/llavatarappearance.cpp # indra/llappearance/lldriverparam.cpp # indra/llappearance/llwearable.cpp # indra/llcommon/llerror.cpp # indra/llcommon/llqueuedthread.cpp # indra/llcommon/llsdserialize.h # indra/llcommon/llthreadsafequeue.h # indra/newview/app_settings/settings.xml # indra/newview/llpathfindingnavmesh.cpp # indra/newview/llviewerassetstorage.cpp # indra/newview/llviewerdisplay.cpp # indra/newview/skins/default/xui/de/floater_flickr.xml # indra/newview/skins/default/xui/de/panel_flickr_photo.xml # indra/newview/skins/default/xui/en/floater_about_land.xml # indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml # indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml # indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml # indra/newview/skins/default/xui/fr/floater_flickr.xml # indra/newview/skins/default/xui/fr/panel_flickr_account.xml # indra/newview/skins/default/xui/fr/panel_flickr_photo.xml # indra/newview/skins/default/xui/it/floater_flickr.xml # indra/newview/skins/default/xui/it/panel_flickr_photo.xml # indra/newview/skins/default/xui/ja/floater_flickr.xml # indra/newview/skins/default/xui/ja/panel_flickr_photo.xml # indra/newview/skins/default/xui/pl/floater_avatar_render_settings.xml # indra/newview/skins/default/xui/pl/floater_ban_duration.xml # indra/newview/skins/default/xui/pl/floater_camera_presets.xml # indra/newview/skins/default/xui/pl/floater_classified.xml # indra/newview/skins/default/xui/pl/floater_create_landmark.xml # indra/newview/skins/default/xui/pl/floater_delete_pref_preset.xml # indra/newview/skins/default/xui/pl/floater_fixedenvironment.xml # indra/newview/skins/default/xui/pl/floater_flickr.xml # indra/newview/skins/default/xui/pl/floater_linkreplace.xml # indra/newview/skins/default/xui/pl/floater_load_pref_preset.xml # indra/newview/skins/default/xui/pl/floater_my_environments.xml # indra/newview/skins/default/xui/pl/floater_my_scripts.xml # indra/newview/skins/default/xui/pl/floater_notifications_tabbed.xml # indra/newview/skins/default/xui/pl/floater_pick_track.xml # indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml # indra/newview/skins/default/xui/pl/floater_preferences_view_advanced.xml # indra/newview/skins/default/xui/pl/floater_preview_trash.xml # indra/newview/skins/default/xui/pl/floater_profile.xml # indra/newview/skins/default/xui/pl/floater_settings_picker.xml # indra/newview/skins/default/xui/pl/floater_simple_outfit_snapshot.xml # indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings.xml # indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings_add.xml # indra/newview/skins/default/xui/pl/panel_flickr_photo.xml # indra/newview/skins/default/xui/pl/panel_progress.xml # indra/newview/skins/default/xui/pl/panel_settings_sky_atmos.xml # indra/newview/skins/default/xui/pl/panel_settings_sky_clouds.xml # indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml # indra/newview/skins/default/xui/ru/floater_flickr.xml # indra/newview/skins/default/xui/ru/panel_flickr_account.xml # indra/newview/skins/default/xui/ru/panel_flickr_photo.xml		2023-01-13 15:19:29 +01:00
..
workflows	Merge branch 'contribute' of https://github.com/secondlife/viewer	2023-01-13 15:19:29 +01:00
labeler.yaml	Add automatic PR labels	2022-11-18 07:39:54 -08:00