121 Commits (00c4d2ed4e5daab044f88c5eb58bea5be40e0ba2)

Author	SHA1	Message	Date
Brad Linden	40197e8949	Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development	2024-06-06 09:46:53 -07:00
Andrey Kleshchev	e60adafa33	viewer#1641 Show accurate Alpha mode if asset is missing	2024-06-06 15:27:10 +03:00
Brad Linden	a1f49564d6	Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev	2024-05-23 11:31:19 -07:00
Ansariel	e2e37cced8	Fix line endlings	2024-05-22 22:40:26 +03:00
Ansariel	1b67dd855c	Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A ... # Conflicts: # autobuild.xml # indra/cmake/CMakeLists.txt # indra/cmake/GoogleMock.cmake # indra/llaudio/llaudioengine_fmodstudio.cpp # indra/llaudio/llaudioengine_fmodstudio.h # indra/llaudio/lllistener_fmodstudio.cpp # indra/llaudio/lllistener_fmodstudio.h # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/llaudio/llstreamingaudio_fmodstudio.h # indra/llcharacter/llmultigesture.cpp # indra/llcharacter/llmultigesture.h # indra/llimage/llimage.cpp # indra/llimage/llimagepng.cpp # indra/llimage/llimageworker.cpp # indra/llimage/tests/llimageworker_test.cpp # indra/llmessage/tests/llmockhttpclient.h # indra/llprimitive/llgltfmaterial.h # indra/llrender/llfontfreetype.cpp # indra/llui/llcombobox.cpp # indra/llui/llfolderview.cpp # indra/llui/llfolderviewmodel.h # indra/llui/lllineeditor.cpp # indra/llui/lllineeditor.h # indra/llui/lltextbase.cpp # indra/llui/lltextbase.h # indra/llui/lltexteditor.cpp # indra/llui/lltextvalidate.cpp # indra/llui/lltextvalidate.h # indra/llui/lluictrl.h # indra/llui/llview.cpp # indra/llwindow/llwindowmacosx.cpp # indra/newview/app_settings/settings.xml # indra/newview/llappearancemgr.cpp # indra/newview/llappearancemgr.h # indra/newview/llavatarpropertiesprocessor.cpp # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llbreadcrumbview.cpp # indra/newview/llbreadcrumbview.h # indra/newview/llbreastmotion.cpp # indra/newview/llbreastmotion.h # indra/newview/llconversationmodel.h # indra/newview/lldensityctrl.cpp # indra/newview/lldensityctrl.h # indra/newview/llface.inl # indra/newview/llfloatereditsky.cpp # indra/newview/llfloatereditwater.cpp # indra/newview/llfloateremojipicker.h # indra/newview/llfloaterimsessiontab.cpp # indra/newview/llfloaterprofiletexture.cpp # indra/newview/llfloaterprofiletexture.h # indra/newview/llgesturemgr.cpp # indra/newview/llgesturemgr.h # indra/newview/llimpanel.cpp # indra/newview/llimpanel.h # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryclipboard.cpp # indra/newview/llinventoryclipboard.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorygallery.cpp # indra/newview/lllistbrowser.cpp # indra/newview/lllistbrowser.h # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llpanelprofile.h # indra/newview/llpreviewgesture.cpp # indra/newview/llsavedsettingsglue.cpp # indra/newview/llsavedsettingsglue.h # indra/newview/lltooldraganddrop.cpp # indra/newview/llurllineeditorctrl.cpp # indra/newview/llvectorperfoptions.cpp # indra/newview/llvectorperfoptions.h # indra/newview/llviewerparceloverlay.cpp # indra/newview/llviewertexlayer.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/macmain.h # indra/test/test.cpp	2024-05-22 19:04:52 +02:00
RunitaiLinden	c6d752b880	Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge	2024-05-06 16:48:58 -05:00
Andrey Lihatskiy	1b68f71348	#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed	2024-04-29 07:56:09 +03:00
Andrey Lihatskiy	71ed19839e	Merge branch 'main' into DRTVWR-600-maint-A ... # Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llfloaterchangeitemthumbnail.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llselectmgr.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltooldraganddrop.cpp # indra/newview/llviewerdisplay.cpp # indra/newview/llvovolume.cpp	2024-03-27 00:45:06 +02:00
Ansariel	60d3dd98a4	Convert remaining BOOL to bool	2024-02-21 23:14:31 +02:00
Ansariel	a5261a5fa8	Convert BOOL to bool in llui	2024-02-21 03:00:25 +02:00
Brad Linden	846337483c	Merge branch 'release/materials_featurette' into release/gltf-maint2	2024-02-09 09:47:19 -08:00
Andrey Kleshchev	8075cf04c4	Issue #26 Support texture drop onto PBR materials	2024-02-02 23:51:56 +02:00
Jonathan "Geenz" Goodman	373b06398c	Merge remote-tracking branch 'origin/release/materials_featurette' into DRTVWR-583	2024-01-24 14:37:33 -08:00
Cosmic Linden	711354c2f5	SL-20553: Save material button in build floater now depends on agent inventory rather than object inventory	2023-11-09 13:54:41 -08:00
Jonathan "Geenz" Goodman	c5bfe86915	Merge branch 'DRTVWR-559' into DRTVWR-583	2023-08-29 03:40:10 -07:00
Jonathan "Geenz" Goodman	fbecd348f8	Add protocol level mirror support, and UI.	2023-08-29 03:04:04 -07:00
Andrey Kleshchev	ef33902f22	SL-20145 GLTF specific feature notification	2023-08-21 19:51:04 +03:00
Cosmic Linden	6c8ced0edd	SL-20024: Show loading message when inventory permissions are loading	2023-08-11 16:31:01 -07:00
Cosmic Linden	a5d318567c	SL-20024: (WIP) (untested) Fix GLTF material permissions in some more edge cases	2023-08-11 16:31:00 -07:00
Cosmic Linden	e7e565dc6e	SL-20024: Put material in object inventory when material is no-modify or no-transfer	2023-08-11 16:30:49 -07:00
Andrey Kleshchev	87c00d8daa	SL-20133 Shift clicking selected face leaves Editor's Texture tab in a weird state	2023-08-10 17:01:47 +03:00
Andrey Kleshchev	5e344813dc	SL-18396 PBR and blinn phong should not be allowed to be edited together	2023-07-27 23:26:46 +03:00
Jonathan "Geenz" Goodman	040050af19	Merge branch 'DRTVWR-559' into DRTVWR-583	2023-07-17 15:06:23 -07:00
Brad Linden	f975cfd736	Merge remote-tracking branch 'origin/main' into DRTVWR-559	2023-07-17 13:37:03 -07:00
Jonathan "Geenz" Goodman	d8dd4d9c0c	Just about got hero reflection maps working. ... DRTVWR-583	2023-06-27 20:01:52 -07:00
Andrey Kleshchev	89afd1cd48	D580 Fix coding policy failures	2023-02-28 21:46:43 +02:00
Alexander Gavriliuk	0e837fbaad	Fix formatting in indra/newview/llpanelface.* files	2023-02-27 21:46:54 +01:00
Andrey Kleshchev	a549140fd0	SL-19183 PBR mapping scale values start on zero	2023-02-14 00:12:09 +02:00
Andrey Kleshchev	3290f16f29	SL-18854 Fix drag'n drop of plain textures on faces in PBR mode ... When in PBR 'mode', defaulted texture drops to diffuse channel	2023-01-04 13:31:27 +02:00
Cosmic Linden	fd19fb2f91	SL-18732: Fix clang build error	2022-11-29 16:01:27 -08:00
Cosmic Linden	bfcb07270e	SL-18732: Review feedback	2022-11-29 15:20:44 -08:00
Cosmic Linden	a989eba080	SL-18732: Fix flickering of control values when changing GLTF texture transforms in build floater	2022-11-29 13:26:04 -08:00
Cosmic Linden	fd76c195c8	SL-18632: Implement editing GLTF material texture transforms in build floater	2022-11-15 18:11:27 -08:00
Cosmic Linden	eab3d43e1b	SL-18627: Make space for pbr transform controls in build floater and disable some WIP controls	2022-11-11 12:43:20 -08:00
Andrey Kleshchev	a87505333e	SL-18448 Save material button in tools floater	2022-11-03 00:28:21 +02:00
Andrey Kleshchev	b6a35e36d7	SL-18448 Material Editor and Tools floater adjustments ... 1. Enable glow 2. Added buttons to texture->pbr	2022-10-29 02:52:56 +03:00
Brad Kittenbrink (Brad Linden)	bda4206627	WIP for SL-18103 and SL-17697 live editing of materials using ModifyMaterialParams cap	2022-10-14 14:44:05 -07: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
Andrey Kleshchev	20dc30450c	SL-17999 PBR material in tool's texture tab	2022-09-01 13:26:10 +03:00
Brad Kittenbrink	38208441db	Merge remote-tracking branch 'origin/master' into DRTVWR-559	2022-08-04 10:59:26 -07:00
Andrey Lihatskiy	51efcfea25	DRTVWR-544 Post-merge build fix	2022-08-04 01:51:07 +03:00
Andrey Lihatskiy	59ab8e78f4	Merge branch 'master' into DRTVWR-544-maint ... # Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/llpanelobject.cpp	2022-08-04 00:17:55 +03:00
Brad Kittenbrink	356817d2fc	SL-17198 fixes to get material asset serialization working better	2022-05-06 10:02:47 -07:00
Dave Houlton	cce5fdca84	SL-17325 apply inventory material to face	2022-05-05 15:38:16 -06:00
Brad Kittenbrink	cc04903379	Merge remote-tracking branch 'origin/euclid-17277' into brad/SL-17116-material-messaging	2022-04-28 14:05:49 -07:00
Brad Kittenbrink	c9ef206e39	Beginning viewer side work for SL-17198 new asset and inventory types for Materials	2022-04-28 13:08:37 -07:00
Brad Kittenbrink	3f43553ea0	Test UI for SL-17116. provide a debug interface to set a MaterialID for a face	2022-04-27 14:55:06 -07:00
Dave Houlton	c4625d26e5	Prototype a SaveMaterial button	2022-04-27 12:18:30 -06:00
Mnikolenko Productengine	2445525cc5	SL-17231 Copying textures should be disabled if object content was not yet updated	2022-04-19 02:33:59 +03:00
Andrey Kleshchev	bb71cbed04	SL-16344 #6 Fixed 'choose media' button not working in some cases	2022-02-01 23:52:27 +02:00