535 Commits (4d2549969ca0e2852d06b1eed01e14d680fc5bd0)

Author	SHA1	Message	Date
Ansariel	4d2549969c	Merge branch 'DRTVWR-592' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llimage/llimage.cpp # indra/llrender/llvertexbuffer.h # indra/newview/app_settings/settings.xml # indra/newview/lldrawpoolterrain.cpp # indra/newview/lldynamictexture.cpp # indra/newview/lltexturectrl.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewertexture.cpp # indra/newview/pipeline.cpp # indra/newview/skins/default/xui/en/panel_region_terrain.xml	2024-01-23 16:03:33 +01:00
Cosmic Linden	a91f08ba84	Merge branch 'DRTVWR-559' into DRTVWR-592	2023-10-13 14:02:51 -07:00
Cosmic Linden	763a9b5249	DRTVWR-592: Working tangent calculation, not yet used	2023-10-13 09:57:32 -07:00
Ansariel	4532e17e3d	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llwindow/llwindowwin32.cpp # indra/newview/llpanelface.cpp	2023-09-20 15:07:19 +02:00
Cosmic Linden	a280bacfea	SL-20157: Fix scale of avatar mesh parts when mikktspace tangent generation fails	2023-09-12 10:50:26 -07:00
Ansariel	fe243a3042	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llmeshrepository.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewerobjectlist.cpp # indra/newview/llvovolume.cpp # indra/newview/llworld.cpp # indra/newview/pipeline.cpp # indra/newview/skins/default/xui/en/notifications.xml	2023-06-27 13:14:11 +02:00
Andrey Kleshchev	ca84e0e0c0	SL-5161 Avatars should stay hidden longer if they are waiting for meshes or skin data	2023-06-23 13:01:19 +03:00
Ansariel	d927ba575a	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/llcommon/llqueuedthread.cpp # indra/llcommon/llqueuedthread.h # indra/llcommon/lluuid.cpp # indra/llcommon/llworkerthread.cpp # indra/llimage/llimageworker.h # indra/newview/VIEWER_VERSION.txt # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llfilepicker.cpp # indra/newview/lltexturefetch.cpp # indra/newview/llviewerdisplay.cpp # indra/newview/llviewermenu.cpp	2023-05-17 21:40:54 +02:00
Brad Linden	2f44377b3e	Merge remote-tracking branch 'origin/main' into DRTVWR-559	2023-05-17 11:17:48 -07:00
Ansariel	9057bfc995	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llcommon/llcallstack.h # indra/llinventory/llsettingssky.cpp # indra/llmath/llvolume.cpp # indra/llwindow/llwindowwin32.cpp # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llmeshrepository.cpp # indra/newview/llmeshrepository.h # indra/newview/llviewerstats.cpp # indra/newview/llvoavatar.cpp	2023-05-05 12:35:33 +02:00
RunitaiLinden	1cadfd44fe	DRTVWR-559 WIP - optimize ARC calculation et al.	2023-05-03 17:30:02 -05:00
Ansariel	9ffb2514db	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer ... # Conflicts: # indra/cmake/00-Common.cmake # indra/newview/app_settings/settings.xml # indra/newview/installers/windows/installer_template.nsi # indra/newview/llviewermenu.cpp # indra/newview/pipeline.cpp # indra/newview/skins/default/xui/en/menu_viewer.xml	2023-04-17 10:01:32 +02:00
RunitaiLinden	6c5b907670	SL-19358 Fix for explody meshes.	2023-04-13 19:41:11 -05:00
Ansariel	5323ccf3b3	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llcommon/llprofiler.h # indra/llcommon/llprofilercategories.h # indra/llcommon/lluuid.cpp # indra/newview/app_settings/settings.xml # indra/newview/featuretable.txt # indra/newview/llagent.cpp # indra/newview/llface.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewertexture.cpp	2023-03-20 11:14:08 +01:00
Ansariel	2c03c96b3e	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2023-03-07 13:23:03 +01:00
Rye Mutt	3377b19de4	Fix double copy of tangents array (#107)	2023-03-06 09:15:38 -06:00
Zi Ree	79c9873cd0	Linux: Pull in Alchemy's vertex cache optimizer fix to smooth out triangle soup in certain hair/tails - Thank you!	2023-02-16 17:46:43 +01:00
Andrey Kleshchev	6c54c9f8a9	Merge branch 'main' into DRTVWR-577-maint-S ... # Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm	2023-02-09 22:33:52 +02:00
Ansariel	fb727de6e3	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm # indra/newview/llmeshrepository.cpp	2023-02-03 22:33:41 +01:00
Ansariel	73e5615d43	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/llimagej2coj/llimagej2coj.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/shaders/class1/deferred/skyF.glsl # indra/newview/app_settings/shaders/class1/deferred/skyV.glsl # indra/newview/app_settings/shaders/class2/deferred/skyF.glsl # indra/newview/llsettingsvo.cpp	2023-02-03 11:11:13 +01:00
Brad Linden	5fabfa50d7	Merge remote-tracking branch 'origin/main' into DRTVWR-559	2023-02-02 12:11:40 -08:00
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
Ansariel	f7063cecdd	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/llmath/llvolume.cpp # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llappviewer.cpp # indra/newview/lltexturefetch.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewertexturelist.h	2022-12-14 10:13:07 +01:00
Brad Linden	eb526fec0a	Merge remote-tracking branch 'origin/main' into DRTVWR-559	2022-12-12 17:59:34 -08:00
Ansariel	67081f9728	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # doc/contributions.txt # indra/newview/llfloater360capture.cpp	2022-12-12 22:09:54 +01:00
Andrey Lihatskiy	f836194516	Merge branch 'main' into DRTVWR-570-maint-Q ... # Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp	2022-12-12 20:53:11 +02:00
Nat Goodspeed	12f66fda13	DRTVWR-565: Merge branch 'origin/contribute' into DRTVWR-565	2022-12-12 13:27:57 -05:00
Nat Goodspeed	5a74f7648a	DRTVWR-575: A few more tweaks addressing size_t wider than 32 bits.	2022-11-03 15:18:32 -04:00
Ansariel	a1090f5f5d	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llrendertarget.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/lldrawpoolalpha.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/quickprefs.cpp	2022-10-24 19:54:30 +02:00
Ansariel	1ca8584322	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-10-22 15:48:47 +02:00
Andrey Kleshchev	24fb2f8336	Merge branch 'master' (DRTVWR-548) into DRTVWR-559 ... # Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llrendertarget.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloaterpreference.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp	2022-10-21 18:19:27 +03:00
Ansariel	8b0d341aca	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-10-21 12:34:53 +02:00
Andrey Lihatskiy	e0ace0c722	Merge branch 'master' into DRTVWR-570-maint-Q ... # Conflicts: # indra/newview/llnetmap.cpp # indra/newview/llnetmap.h	2022-10-20 22:34:11 +03:00
Andrey Lihatskiy	97b676b60f	Merge branch 'master' into DRTVWR-565-maint-P	2022-10-20 21:43:54 +03:00
Ansariel	2aceea66ff	Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llmath/llvolume.cpp # indra/llmath/llvolume.h # indra/newview/llfloateropenobject.cpp # indra/newview/llfloateropenobject.h # indra/newview/llmaterialmgr.cpp # indra/newview/llmeshrepository.cpp # indra/newview/llmeshrepository.h # indra/newview/skins/default/xui/en/floater_openobject.xml	2022-10-01 13:10:39 +02:00
Rye Mutt	1b31ab5c52	Introduce a U8* based interface to unzip_llsd and unpackVolumeFaces	2022-09-27 17:59:21 -04:00
Ansariel	c3eb62664b	Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyV.glsl # indra/newview/featuretable.txt # indra/newview/featuretable_mac.txt # indra/newview/llpanelface.cpp # indra/newview/llreflectionmapmanager.cpp # indra/newview/pipeline.cpp # indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml	2022-09-26 15:21:07 +02:00
Dave Parks	75de4d3276	SL-18156 Cleanup of MikktSpace integration, apply MikktSpace tangents to all meshes.	2022-09-23 12:53:24 -05:00
Ansariel	9756e0e89e	Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llimagegl.cpp # indra/llrender/llrender.cpp # indra/newview/app_settings/settings.xml # indra/newview/lldynamictexture.cpp # indra/newview/llface.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewerwindow.cpp	2022-09-17 12:02:14 +02:00
Dave Parks	09f3d6eaee	Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559	2022-09-16 16:25:38 -05:00
Dave Parks	8dc59e5ef3	SL-18128 Clear out much OpenGL cruft and switch to core profile on AMD	2022-09-16 16:25:26 -05:00
Andrey Kleshchev	7649114588	Merge branch master (DRTVWR-571) into DRTVWR-559 ... # Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h	2022-09-16 21:07:39 +03:00
Ansariel	5a78473123	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/settings.xml # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/skins/default/xui/en/menu_viewer.xml	2022-09-16 11:23:28 +02:00
Ansariel	5178e59b59	Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer	2022-09-16 09:37:16 +02:00
Dave Parks	82ab5f9765	SL-18156 WIP -- Add NormalizedScale/NormalizedTranslation to mesh assets to recover mesh's original coordinate frame when generating tangents post download.	2022-09-15 17:23:34 -05:00
Ansariel	2507bc6137	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-09-15 20:37:16 +02:00
Ansariel	656dd12dfc	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/newview/llmodelpreview.h	2022-09-15 20:35:44 +02:00
Andrey Lihatskiy	329268c5f7	Merge branch 'master' into DRTVWR-548-maint-N ... # Conflicts: # indra/newview/llmodelpreview.h	2022-09-15 20:44:04 +03:00
Andrey Lihatskiy	b5861e58cb	Merge branch 'master' into DRTVWR-565-maint-P	2022-09-15 20:43:02 +03:00
Ansariel	1f176fdc18	Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # indra/llmath/llvolume.cpp # indra/llrender/llglslshader.cpp # indra/llrender/llpostprocess.cpp # indra/llrender/llrender.cpp # indra/newview/llpanelface.cpp # indra/newview/lltexturectrl.cpp # indra/newview/llvieweroctree.cpp # indra/newview/llviewershadermgr.cpp # indra/newview/skins/default/xui/en/floater_texture_ctrl.xml	2022-09-13 20:11:44 +02:00