312 Commits (5bb91bbae27dd2f065c5fe42a9f0cbfa8d5847ea)

Author	SHA1	Message	Date
Ansariel	e7b3d68cab	Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/cmake/LLPhysicsExtensions.cmake # indra/llprimitive/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/lltexturectrl.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llvovolume.cpp # indra/newview/skins/default/xui/en/floater_marketplace.xml # indra/newview/skins/default/xui/en/floater_model_preview.xml # indra/newview/skins/default/xui/en/floater_search.xml	2025-10-11 18:51:03 +02:00
Jonathan "Geenz" Goodman	2cdcd336ba	Merge pull request #4783 from RyeMutt/rye/convexdecomp ... Introduce initial VHACD based llconvexdecomposition library	2025-10-10 17:17:25 -04:00
Rye	b277cc6a8f	Initial VHACD based llconvexdecomposition	2025-10-03 09:51:03 -04:00
Ansariel	2756f190b4	Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llfloaterdisplayname.cpp # indra/newview/lllogininstance.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llpanelprofile.cpp # indra/newview/skins/default/xui/en/panel_profile_firstlife.xml # indra/newview/skins/default/xui/en/panel_profile_secondlife.xml	2025-09-27 11:39:25 +02:00
Andrey Kleshchev	351b7763a8	#4515 Improve ordering of sub-meshes upon upload	2025-09-24 22:12:47 +03:00
Ansariel	440c7f214e	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2025-08-13 20:31:56 +02:00
Ansariel	1c6331efd5	Fix another issue	2025-08-11 14:03:30 +02:00
Ansariel	0d8af269df	Fix remaining unused variable issues	2025-08-11 13:53:56 +02:00
Ansariel	539959a7f8	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop ... # Conflicts: # .github/workflows/qatest.yaml # indra/newview/llfloatermodelpreview.cpp # indra/newview/llvoavatar.cpp # indra/newview/llwearableitemslist.cpp	2025-08-06 18:47:44 +02:00
Andrey Kleshchev	ce9d66cdd1	Merge branch develop into 2025.06 ... # Conflicts: # indra/newview/llvoavatar.cpp	2025-08-06 16:05:19 +03:00
Ansariel	f37e2785d5	Merge branch 'release/2025.05' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/skins/default/xui/en/panel_preferences_sound.xml	2025-07-27 12:54:37 +02:00
Maxim Nikolenko	5c746ae372	#4415 fix crash when cancelling large model process on MacOS	2025-07-25 01:44:36 +03:00
Andrey Kleshchev	d84897967e	#4318 Warn or log when texture gets scaled down ... for material and model upload	2025-07-22 19:16:26 +03:00
Ansariel	bfd99549b0	Merge branch 'release/2025.05' of https://github.com/secondlife/viewer ... # Conflicts: # .github/pull_request_template.md # indra/llappearance/lltexlayer.cpp # indra/llcommon/llthread.cpp # indra/llprimitive/lldaeloader.cpp # indra/llprimitive/lldaeloader.h # indra/llprimitive/llmodel.cpp # indra/newview/CMakeLists.txt # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/settings.xml # indra/newview/llmodelpreview.cpp # indra/newview/lltoolpie.cpp # indra/newview/skins/default/xui/en/floater_model_preview.xml # indra/newview/skins/default/xui/en/panel_preferences_sound.xml	2025-07-18 14:14:54 +02:00
Andrey Kleshchev	b7dbe0e49e	#4290 Unresponsive viewer when uploading models ... Fix severe log spam	2025-07-08 00:52:35 +03:00
Andrey Kleshchev	10b787e3e6	#4322 Upload Model button is sometimes disabled ... when it should not	2025-07-03 00:32:58 +03:00
Andrey Kleshchev	5a0bbdc510	#4242 Debug dump improvement ... for better comparison with collada output	2025-07-03 00:32:58 +03:00
Ansariel	75db5e8b6b	Revert "Fix LLCharacter base class constness." and restore improvements from 10a324a103 instead	2025-06-28 19:31:02 +02:00
Andrey Kleshchev	54660c8931	#4147 Joint Overrides #3 ... Remande skeleton translation from default skeleton to overriden skeleton	2025-06-13 21:49:02 +03:00
Andrey Kleshchev	8322a9a61e	#4147 Joint Overrides #2	2025-06-12 15:55:47 +03:00
Andrey Kleshchev	b20d10c0cc	#4148 Skeleton Translation	2025-06-09 20:06:01 +03:00
Ansariel	7b770b1786	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master ... # Conflicts: # .github/workflows/qatest.yaml # indra/llcommon/llsdutil.h # indra/newview/llinventorybridge.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h # indra/newview/skins/default/xui/ja/strings.xml	2025-05-29 12:34:42 +02:00
Andrey Lihatskiy	b08ba3fa7b	Merge branch 'main' into marchcat/2505-merge ... # Conflicts: # .github/workflows/qatest.yaml # indra/llcommon/llsdutil.h # indra/llui/llflatlistview.h # indra/newview/llinventorybridge.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h	2025-05-28 21:38:00 +03:00
Ansariel	6cb5a7425f	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/newview/llskinningutil.cpp # indra/newview/llvoavatar.cpp # indra/newview/skins/default/xui/ja/strings.xml	2025-05-23 12:22:21 +02:00
Andrey Lihatskiy	a58adfff8f	#4105 Support .gltf and .glb files in lookupLODModelFiles	2025-05-21 08:36:03 +03:00
Jonathan "Geenz" Goodman	bb76eae4b8	Merge branch 'release/2025.04' into geenz/gltf-mesh-import	2025-05-16 19:05:57 -04:00
Ansariel	469795979f	Merge branch 'release/2025.04' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llpanelface.cpp # indra/newview/llviewercamera.cpp # indra/newview/llviewerregion.cpp # indra/newview/skins/default/colors.xml	2025-05-14 21:56:38 +02:00
Ansariel	6f2974a669	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2025-05-14 21:15:25 +02:00
Ansariel	7e87933db3	Add additional performance tweaks already integrated in LL's develop branch	2025-05-12 22:00:32 +02:00
Andrey Kleshchev	872fd15caf	#4056 Crash at childGetSelectionInterface ... in model importer	2025-05-10 11:25:56 +03:00
Ansariel	9d6c74a051	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2025-04-25 22:21:12 +02:00
Ansariel	8ba07f3165	Replace JointKey construct with more upstream-based approach, optimized by using std::string_view and heterogeneous map lookups	2025-04-24 19:26:55 +02:00
Ansariel	4c355879cc	Merge branch 'release/2025.05' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/llui/llfolderviewitem.h # indra/llui/lltexteditor.cpp # indra/llui/lltexteditor.h # indra/newview/app_settings/settings.xml # indra/newview/llagent.cpp # indra/newview/llappviewer.cpp # indra/newview/llfloatermodelpreview.h # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryfilter.cpp # indra/newview/llinventoryfilter.h # indra/newview/llmaterialeditor.cpp # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/llpanelmaininventory.cpp # indra/newview/llpaneloutfitedit.cpp # indra/newview/llpaneloutfitsinventory.cpp # indra/newview/llpaneloutfitsinventory.h # indra/newview/llpanelpermissions.cpp # indra/newview/llpanelpermissions.h # indra/newview/llpanelwearing.cpp # indra/newview/llpanelwearing.h # indra/newview/llselectmgr.h # indra/newview/llskinningutil.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturefetch.cpp # indra/newview/lltooldraganddrop.cpp # indra/newview/llviewerattachmenu.cpp # indra/newview/llviewerinventory.cpp # indra/newview/llviewerinventory.h # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llwearableitemslist.cpp # indra/newview/skins/default/textures/textures.xml # indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/en/floater_object_weights.xml # indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml # indra/newview/skins/default/xui/en/menu_inventory.xml # indra/newview/skins/default/xui/en/menu_outfit_tab.xml # indra/newview/skins/default/xui/en/menu_wearing_tab.xml # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_main_inventory.xml # indra/newview/skins/default/xui/en/panel_outfit_gallery.xml # indra/newview/skins/default/xui/en/panel_outfits_list.xml # indra/newview/skins/default/xui/en/panel_outfits_wearing.xml # indra/newview/skins/default/xui/en/panel_places.xml # indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml # indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml # indra/newview/skins/default/xui/en/sidepanel_appearance.xml # indra/newview/skins/default/xui/en/strings.xml # indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml # indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml	2025-04-16 17:49:47 +02:00
Ansariel	a510a1da00	Convert BOOL to bool ... # Conflicts: # indra/newview/llagent.cpp	2025-04-10 23:54:36 +03:00
Andrey Lihatskiy	5d7a5001b4	Merge commit '9e24b30' into marchcat/maint-c/restore ... # Conflicts: # indra/llmath/v2math.cpp # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llmath/v4math.h # indra/llui/llfolderviewitem.cpp # indra/llui/llfolderviewitem.h # indra/llui/llfolderviewmodel.h # indra/llui/llmodaldialog.cpp # indra/llui/lltexteditor.cpp # indra/llui/lltexteditor.h # indra/llwindow/llwindowwin32.cpp # indra/newview/llagent.cpp # indra/newview/llagentcamera.h # indra/newview/llavatarrenderinfoaccountant.cpp # indra/newview/llconversationmodel.h # indra/newview/llfloaterinventorysettings.cpp # indra/newview/llfloaternamedesc.cpp # indra/newview/llfloaternamedesc.h # indra/newview/llfloaterobjectweights.cpp # indra/newview/llfloaterobjectweights.h # indra/newview/llfolderviewmodelinventory.h # indra/newview/llinspecttexture.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventorygallery.h # indra/newview/llinventorygallerymenu.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/llmaterialeditor.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/llpanelgroupcreate.cpp # indra/newview/llpanelgroupgeneral.cpp # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpaneloutfitsinventory.h # indra/newview/llpanelprofile.cpp # indra/newview/llpanelwearing.cpp # indra/newview/llreflectionmap.cpp # indra/newview/llselectmgr.cpp # indra/newview/llsidepanelappearance.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llteleporthistorystorage.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltexturefetch.cpp # indra/newview/lltexturefetch.h # indra/newview/llviewerassetupload.cpp # indra/newview/llviewercamera.cpp # indra/newview/llviewercamera.h # indra/newview/llviewermenufile.cpp # indra/newview/llviewerobject.h # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvoavatarself.cpp # indra/newview/llvovolume.cpp # indra/newview/llvovolume.h # indra/newview/tests/llviewerassetstats_test.cpp	2025-04-10 06:01:50 +03:00
Jonathan "Geenz" Goodman	c8499b7f01	GLTF WIP. Still working on getting transforms working proper and need to figure out our indices.	2025-04-08 13:51:21 -04:00
Ansariel	beb3ff3d36	Merge branch 'release/2025.04' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llagentlistener.cpp # indra/newview/llappearancemgr.cpp # indra/newview/llviewerparcelmgr.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvoavatarself.h	2025-04-04 12:46:39 +02:00
Andrey Lihatskiy	497c309a5b	#912 Refactor FindModel()	2025-04-01 15:24:15 +03:00
Alexander Gavriliuk	c609a45c26	secondlife/viewer#912 BugSplat Crash 1412267 (missed refactoring for FindModel) ... # Conflicts: # indra/newview/llmodelpreview.cpp	2025-04-01 15:24:15 +03:00
Ansariel	7c3b74a0df	Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llviewertexture.cpp # indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml	2024-12-04 16:11:44 +01:00
Maxim Nikolenko	5ac2adfa28	#3133 add handler to prevent crash when preview gets closed before getting the callback	2024-11-29 00:16:20 +02:00
Ansariel	68d82c9793	Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llrender/llvertexbuffer.cpp # indra/newview/app_settings/settings.xml # indra/newview/lltexturefetch.cpp # indra/newview/viewer_manifest.py	2024-11-27 19:23:33 +01:00
Andrey Kleshchev	bedf884caf	viewer#3133 Callback related crash in LLViewerFetchedTexture ... Seems to be realted to LLModelPreview and path generated textures so I'm improving cleanup.	2024-11-22 20:58:50 +02:00
Ansariel	82e37d1dfc	Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llmodelpreview.cpp	2024-10-07 10:34:08 +02:00
Brad Linden	da341eb2da	cherry pick secondlife/viewer#912 BugSplat Crash 1412267: nvoglv64+0xadcd00 (#2785) ... * secondlife/viewer#912 BugSplat Crash 1412267: nvoglv64+0xadcd00 * fix cherry-pick merge breakage. * Fix signed/unsigned error --------- Co-authored-by: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>	2024-10-04 14:16:04 -07:00
Ansariel	1cca913ba7	Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/cmake/CMakeLists.txt # indra/llprimitive/lldaeloader.cpp # indra/llprimitive/llmodelloader.cpp # indra/llrender/llgl.h # indra/llrender/llrender.h # indra/llui/llurlentry.cpp # indra/llui/llurlentry.h # indra/newview/llviewerdisplay.cpp # indra/newview/llvoavatar.cpp	2024-09-13 18:54:12 +02:00
Rye Mutt	b713f56d07	Replace glh_linear usage with GLM (#2554)	2024-09-12 11:22:10 -05:00
Ansariel	088cc2ea35	Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llcommon/llpointer.h # indra/llcommon/llqueuedthread.cpp # indra/llfilesystem/llfilesystem.cpp # indra/llui/llconsole.cpp # indra/llui/llkeywords.cpp # indra/llui/llstatgraph.cpp # indra/llui/llvirtualtrackball.cpp # indra/newview/llagentcamera.cpp # indra/newview/llappviewer.cpp # indra/newview/llfloateremojipicker.cpp # indra/newview/llfloaterimnearbychathandler.cpp # indra/newview/llfloatersettingsdebug.cpp # indra/newview/llfloatersnapshot.cpp # indra/newview/llglsandbox.cpp # indra/newview/llnetmap.cpp # indra/newview/llpanelface.cpp # indra/newview/llpanelpermissions.cpp # indra/newview/llpanelplaceprofile.cpp # indra/newview/llstartup.cpp # indra/newview/llviewermessage.cpp # indra/newview/llvocache.cpp # indra/newview/llworldmapview.cpp	2024-07-09 02:25:42 +02:00
Ansariel	9fdca96f8b	Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now	2024-07-08 20:27:14 +02:00
Ansariel	e9b6550c48	Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llfilesystem/llfilesystem.cpp # indra/newview/llappviewer.cpp # indra/newview/lltextureview.cpp # indra/newview/llviewertexture.h # indra/newview/llviewertexturelist.cpp	2024-07-06 11:06:55 +02:00