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
..
workflows	Merge branch 'contribute' of https://github.com/secondlife/viewer	2023-03-01 12:54:24 +01:00
labeler.yaml	Add automatic PR labels	2022-11-18 07:39:54 -08:00