621 Commits (5c03f284af4eeebe3ee26e8f69b1edc4570dd862)

Author	SHA1	Message	Date
Ansariel	5c03f284af	Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/cmake/APR.cmake # indra/cmake/LLPhysicsExtensions.cmake # indra/newview/llsurface.cpp # indra/newview/pipeline.cpp # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/viewer_manifest.py	2025-10-18 13:01:08 +02:00
Andrey Kleshchev	8679b86cde	#2570 Fix extra setGLTFRenderMaterial ... setRenderMaterialID already calls setGLTFRenderMaterial	2025-10-16 01:23:11 +03: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	a4e8af0dce	Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # .github/pull_request_template.md # CONTRIBUTING.md # indra/newview/CMakeLists.txt # indra/newview/app_settings/settings.xml # indra/newview/llappviewer.cpp # indra/newview/llfloaterimagepreview.cpp # indra/newview/llfloatersettingsdebug.cpp # indra/newview/llfloatersettingsdebug.h # indra/newview/llstatusbar.cpp # indra/newview/llstatusbar.h # indra/newview/res/viewerRes.rc # indra/newview/skins/default/xui/de/panel_login_first.xml # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_login_first.xml # indra/newview/skins/default/xui/en/panel_preferences_advanced.xml # indra/newview/skins/default/xui/en/panel_preferences_privacy.xml # indra/newview/skins/default/xui/en/panel_status_bar.xml # indra/newview/skins/default/xui/es/panel_login_first.xml # indra/newview/skins/default/xui/fr/panel_login_first.xml # indra/newview/skins/default/xui/it/panel_login_first.xml # indra/newview/skins/default/xui/ja/panel_login_first.xml # indra/newview/skins/default/xui/pl/panel_login_first.xml # indra/newview/skins/default/xui/pt/panel_login_first.xml # indra/newview/skins/default/xui/ru/panel_login_first.xml # indra/newview/skins/default/xui/tr/panel_login_first.xml # indra/newview/skins/default/xui/zh/panel_login_first.xml # indra/newview/viewer_manifest.py	2025-07-30 10:52:39 +02:00
Andrey Kleshchev	dcd9d368c2	#3964 Don't spawn CEF instances for the build tools ... unless strictly needed	2025-07-16 23:41:54 +03:00
Ansariel	1829d9083d	Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # .github/pull_request_template.md # indra/newview/llmutelist.cpp # indra/newview/lltoolpie.cpp # indra/newview/llvoavatar.cpp # indra/newview/skins/default/xui/en/panel_preferences_sound.xml	2025-07-16 13:28:58 +02:00
Maxim Nikolenko	210abc3755	#4349 fix repeats cannot be adjusted for specular when a normal map is not applied	2025-07-10 15:15:10 +03:00
Ansariel	159c05a5ac	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master ... # Conflicts: # .github/workflows/qatest.yaml # indra/newview/skins/default/xui/ja/strings.xml	2025-05-30 13:26:29 +02: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
Jonathan "Geenz" Goodman	fe4f85e587	Merge remote-tracking branch 'origin/main' into geenz/2025.04-to-develop	2025-05-28 11:52:16 -04: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
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
Andrey Kleshchev	fb34971786	Revert "#4008 Fix media scale adjustments with pbr applied" ... This reverts commit b084d842c9.	2025-05-12 20:46:12 +03:00
Ansariel	9df4d7ba96	Merge branch 'release/2025.04' of https://github.com/secondlife/viewer ... # Conflicts: # indra/cmake/Python.cmake # indra/newview/llimview.cpp # indra/newview/llpanelface.cpp # indra/newview/skins/default/colors.xml	2025-05-08 14:49:31 +02:00
Andrey Kleshchev	b084d842c9	#4008 Fix media scale adjustments with pbr applied	2025-05-07 00:37:14 +03:00
Ansariel	8579ed4a71	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/newview/skins/default/xui/de/notifications.xml	2025-05-05 16:14:13 +02:00
Ansariel	fef4f9a07e	Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llappearance/llavatarappearance.h # indra/llcharacter/llcharacter.cpp # indra/llcharacter/llcharacter.h # indra/llcharacter/lljoint.cpp # indra/llcharacter/lljoint.h # indra/llimage/llimagedimensionsinfo.cpp # indra/llprimitive/lldaeloader.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h # indra/newview/llmodelpreview.cpp # indra/newview/llpanelface.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelprofilepicks.cpp # indra/newview/llpanelprofilepicks.h # indra/newview/llviewerdisplay.cpp # indra/newview/llviewerparceloverlay.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvoavatarself.cpp # indra/newview/llvoavatarself.h # indra/newview/llwatchdog.cpp # indra/newview/llwatchdog.h	2025-05-03 15:45:54 +02:00
Ansariel	5927fba8c0	Set PBR material precision for classic texture panel	2025-05-03 15:40:29 +02:00
Ansariel	3d61db550d	Merge branch 'release/2025.04' of https://github.com/secondlife/viewer ... # Conflicts: # .github/workflows/qatest.yaml # indra/newview/skins/default/xui/en/notifications.xml	2025-05-03 13:26:46 +02:00
Maxim Nikolenko	fdda524ee1	#3791 check against alpha blending as a part of determining exclude water	2025-04-29 00:50:38 +03:00
Andrey Kleshchev	7bd18e256d	viewerp#300 Fix inconsistency with copying textures vs pbr	2025-04-28 23:36:55 +03:00
Hecklezz	56ec95de29	Fix scale values not updating if they were focused and you used repeats per meter	2025-04-25 01:28:41 +10:00
Hecklezz	1970390478	Autofit Blinn Phong normal and specular when using repeats per meter	2025-04-24 23:46:42 +10:00
Hecklezz	3dc6c22401	Implemented PBR repeats per meter	2025-04-24 07:51:04 +10:00
Ansariel	86f0483152	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop ... # Conflicts: # indra/llmath/v2math.cpp # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llmath/v4math.h	2025-04-18 20:24:19 +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
Andrey Lihatskiy	06a76eda6a	Merge branch 'develop' into marchcat/05-develop	2025-04-15 22:19:15 +03:00
Andrey Lihatskiy	ae93198735	Merge branch 'main' into marchcat/maint-c-restore ... # Conflicts: # indra/llcommon/lldate.h # indra/newview/llappviewer.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llmaterialeditor.cpp # indra/newview/llviewerparceloverlay.cpp # indra/newview/llvoavatar.cpp	2025-04-15 19:31:20 +03:00
Ansariel	cdf8eda7d0	Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # .github/workflows/qatest.yaml # indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml	2025-04-15 18:03:59 +02:00
Jonathan "Geenz" Goodman	d19d44cc72	Merge pull request #3911 from secondlife/main ... Merge 2025.03 release into develop.	2025-04-15 10:14:27 -04: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
Hecklezz	2bb4de97e4	Fix normal and specular repeats per meter scaling	2025-04-02 20:05:00 +03:00
Ansariel	99e1699479	Merge branch 'release/2025.03' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llappearance/llwearable.cpp # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llviewerassetstorage.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewerwindow.cpp	2025-03-27 19:36:45 +01:00
Maxim Nikolenko	6b88a2bec2	#3780 disable water exclusion if user applies PBR or Media	2025-03-24 18:05:06 +02:00
Ansariel	62e5fffd8e	Merge branch 'release/2025.03' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/lldrawpooltree.cpp # indra/newview/lllocalbitmaps.cpp # indra/newview/lltextureview.cpp # indra/newview/llviewertexture.cpp # indra/newview/skins/default/colors.xml	2025-03-23 12:29:33 +01:00
Maxim Nikolenko	c695ae285f	#3779 reset texture repeats when unchecking the Hide Water option	2025-03-20 21:10:06 +02:00
Ansariel	4e2bfd7327	Merge branch 'release/2025.03' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llcallingcard.cpp # indra/newview/llinventorybridge.cpp # indra/newview/skins/default/xui/en/menu_inventory.xml # indra/newview/skins/default/xui/en/menu_viewer.xml # indra/newview/skins/default/xui/ja/strings.xml # indra/newview/skins/default/xui/zh/strings.xml	2025-03-19 15:23:20 +01:00
Andrey Kleshchev	0ad55a33a0	#3189 Pasted PBR materials disappearing	2025-03-13 01:04:13 +02:00
Ansariel	6a10f6f20a	Merge branch 'release/2025.03' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llappdelegate-objc.mm # indra/newview/llpanelface.cpp # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_tools_texture.xml	2025-03-05 10:12:03 +01:00
Maxim Nikolenko	a1ccb44c15	#3512 Add UX for marking water exclusion surfaces	2025-03-03 22:29:26 +02:00
Ansariel	8758495d11	Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llcommon/llerror.cpp # indra/llmath/v4math.h # indra/llui/lltransutil.cpp # indra/newview/llface.cpp # indra/newview/llstartup.cpp # indra/newview/llvovolume.cpp	2025-01-26 00:07:35 +01:00
Andrey Kleshchev	5af750a130	#3450 Crash at LLViewerMediaTexture::setPlaying	2025-01-22 16:06:30 +02:00
Ansariel	dde5e9a8c1	Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/newview/CMakeLists.txt # indra/newview/llvoavatar.cpp	2024-08-10 14:38:13 +02:00
Ansariel Hiller	f782f5f534	Fix copy&paste error in LLPanelFace (#2233)	2024-08-09 00:21:28 +03:00
Ansariel	3be6763aa0	Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/cmake/APR.cmake # indra/cmake/Copy3rdPartyLibs.cmake # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llface.h # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/llviewerobjectlist.cpp # indra/newview/llviewerobjectlist.h # indra/newview/llvoavatar.cpp # indra/newview/pipeline.cpp # indra/newview/viewer_manifest.py	2024-08-08 21:34:26 +02:00
Alexander Gavriliuk	e20e387d48	#1922 Make PBR scale and offset crosshair work (fix PBR channels in LLPanelFace)	2024-08-07 20:25:32 +02:00
Alexander Gavriliuk	413ece6c48	#1922 Make PBR scale and offset crosshair work (store control pointers in LLPanelFace)	2024-08-07 19:11:52 +02:00
Alexander Gavriliuk	93164fc560	#1922 Make PBR scale and offset crosshair work (fix callbacks in LLPanelFace)	2024-08-07 16:03:21 +02:00