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
..
CMakeLists.txt	This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal	2021-03-09 14:39:51 -08:00
llavatarappearance.cpp	Merge branch 'contribute' of https://github.com/secondlife/viewer	2023-01-13 15:19:29 +01:00
llavatarappearance.h	Merge branch 'contribute' of https://github.com/secondlife/viewer	2023-01-13 15:19:29 +01:00
llavatarappearancedefines.cpp	Merge branch 'contribute' of https://github.com/secondlife/viewer	2023-01-13 15:19:29 +01:00
llavatarappearancedefines.h	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2021-02-03 19:05:20 +01:00
llavatarjoint.cpp	SL-18893 Fixes for pull requests #38, #41, and #42 (#46)	2023-01-10 11:43:27 +02:00
llavatarjoint.h	SL-333 WIP - added back some unused constructors to make the appearance utility happier	2016-02-12 15:40:46 -05:00
llavatarjointmesh.cpp	SL-18893 Fixes for pull requests #38, #41, and #42 (#46)	2023-01-10 11:43:27 +02:00
llavatarjointmesh.h	…
lldriverparam.cpp	Merge branch 'contribute' of https://github.com/secondlife/viewer	2023-01-13 15:19:29 +01:00
lldriverparam.h	Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer	2021-11-12 17:31:39 +01:00
lljointpickname.h	…
lllocaltextureobject.cpp	Merge branch 'contribute' of https://github.com/secondlife/viewer	2023-01-13 15:19:29 +01:00
lllocaltextureobject.h	…
llpolymesh.cpp	Merge branch 'contribute' of https://github.com/secondlife/viewer	2023-01-13 15:19:29 +01:00
llpolymesh.h	…
llpolymorph.cpp	Merge branch 'contribute' of https://github.com/secondlife/viewer	2023-01-13 15:19:29 +01:00
llpolymorph.h	SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton	2021-10-28 18:06:21 +00:00
llpolyskeletaldistortion.cpp	Merge branch 'contribute' of https://github.com/secondlife/viewer	2023-01-13 15:19:29 +01:00
llpolyskeletaldistortion.h	Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer	2021-11-12 17:31:39 +01:00
lltexglobalcolor.cpp	Merge branch 'contribute' of https://github.com/secondlife/viewer	2023-01-13 15:19:29 +01:00
lltexglobalcolor.h	Merge viewer-quickgraphics	2016-03-08 01:41:31 +01:00
lltexlayer.cpp	Merge branch 'contribute' of https://github.com/secondlife/viewer	2023-01-13 15:19:29 +01:00
lltexlayer.h	Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer	2022-04-19 13:21:52 +02:00
lltexlayerparams.cpp	Merge branch 'contribute' of https://github.com/secondlife/viewer	2023-01-13 15:19:29 +01:00
lltexlayerparams.h	Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer	2021-11-12 17:31:39 +01:00
lltexturemanagerbridge.cpp	…
lltexturemanagerbridge.h	…
llviewervisualparam.cpp	Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer	2020-11-12 11:05:22 +01:00
llviewervisualparam.h	…
llwearable.cpp	Merge branch 'contribute' of https://github.com/secondlife/viewer	2023-01-13 15:19:29 +01:00
llwearable.h	Merge viewer-quickgraphics	2016-03-08 01:41:31 +01:00
llwearabledata.cpp	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2021-02-03 22:50:13 +01:00
llwearabledata.h	Merge viewer-quickgraphics	2016-03-08 01:41:31 +01:00
llwearabletype.cpp	Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer	2020-11-12 11:05:22 +01:00
llwearabletype.h	Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer	2020-12-09 13:14:39 +01:00