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
..
code_tools	SL-15742: Convert build scripts to Python 3	2021-12-10 14:42:49 -08:00
content_tools	SL-10025 - via Cathy Foil, all bones now have standard alias 'avatar_' + name.	2022-05-18 23:31:08 +03:00
messages	SL-13313 Updated message_template.msg.sha1	2021-08-31 22:27:45 +03:00
metrics	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-530	2022-01-10 23:31:49 +01:00
perf	SL-15999 - made cwd handling a bit more robust in perfbot_run.py	2021-10-22 18:49:54 +01:00
templates	Update Mac and Windows breakpad builds to latest	2013-03-29 07:50:08 -07:00
testing/lsl	SL-751 - updated lsl test scripts with bug fix, added a version that uses the new command llGetObjectAnimationNames()	2017-08-31 16:48:26 +01:00
configure_firestorm.sh	Let's add this back, too	2022-09-25 13:25:15 +02:00
md5check.py	SL-15742: Convert build scripts to Python 3	2021-12-10 14:42:49 -08:00
packages-formatter.py	Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer	2021-12-16 12:32:34 +01:00
setup-path.py	SL-15742: Convert build scripts to Python 3	2021-12-10 14:42:49 -08:00
template_verifier.py	Update default URL for message template in template_verifier.py as well	2022-11-21 21:15:01 +01:00