7889df945b
Merge remote-tracking branch 'origin/release/materials_featurette' into project/gltf_development
2024-06-04 17:39:39 -07:00
e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
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
7ed053d9a2
viewer#1520 Material upload floater displays wrong upload fee
2024-05-21 10:11:44 +03:00
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
a5261a5fa8
Convert BOOL to bool in llui
2024-02-21 03:00:25 +02:00
361efcb926
Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into DRTVWR-596
2023-11-15 10:32:18 -06:00
ee8b96f3ef
SL-20553: Clean up dead code
2023-11-09 13:54:42 -08:00
0d8893822d
SL-20523 Local textures not updating on PBR Materials #5
2023-11-06 18:29:42 +02:00
52c60ab3fd
SL-20523 Local textures not updating on PBR Materials #4
2023-11-06 18:29:42 +02:00
596a63051e
SL-20523 Local textures not updating on PBR Materials #2
2023-11-06 18:29:42 +02:00
dc63dfc0dd
SL-20523 Local textures not updating on PBR Materials #1
...
Update editor in which texture changed to local
2023-11-06 18:29:42 +02:00
1b493d5690
SL-20343 Material floater was disconnected from object's face
2023-09-28 03:55:43 +03:00
05c8ef3f3c
SL-20167: Grey out the clipboard when copying the material to clipboard is not allowed
2023-09-01 17:36:00 -07:00
57cc252fd6
SL-20024: Miscellaneous cleanup
2023-08-11 16:31:02 -07:00
76c8cca936
SL-20024: Fix author attributions not transferring for saved object materials, fix item not renamed
2023-08-11 16:31:01 -07:00
a5d318567c
SL-20024: (WIP) (untested) Fix GLTF material permissions in some more edge cases
2023-08-11 16:31:00 -07:00
7bf6103ad9
SL-20024: (WIP) (not tested) Improved behavior for saving material to inventory. Check perms, keep perms.
2023-08-11 16:31:00 -07:00
b9b913a60a
SL-19349 Fix for hang on bulk upload of materials, add bulk upload option to material selector, incidental decruft.
2023-03-07 09:38:43 -06:00
d6841c0798
SL-19080: Update GLTF Material asset upload to v1.1, with stricter GLTF compliance and removal of unsupported features
2023-02-09 15:05:19 -08:00
c69c8aa347
SL-18777 PBR upload was stuck waiting for texture
...
Handle obscure upload failure case - floater was waiting for a texture upload indefinetely.
Unblock floater if upload fails.
2022-12-07 02:16:12 +02:00
321c7895d0
SL-18741 Basic bulk upload for gltf materials #1
2022-12-02 10:24:23 +02:00
9f7967fcdc
SL-18727 Save material to Inventoryshould prioritize picked face
2022-11-29 23:36:37 +02:00
32984b56ea
SL-18701 llsd is not thread safe, parse it before using
2022-11-24 20:58:05 +02:00
ade79bc6f6
SL-18677 Disable materials UI when materials caps are not available
2022-11-18 21:15:54 +02:00
080421decb
SL-18583 Make Live Material editor restore changes when canceling in texture or color pickers
2022-11-08 01:22:08 +02:00
a0c7a7ecdc
SL-18548 fix for crash when trying to Save material without caps
2022-11-03 15:17:09 +02:00
0f20cf17fd
SL-18446 Don't cause excessive udpates #2
2022-11-03 01:36:45 +02:00
d042ad67ed
SL-18448 Make material editor's scroll smarter
2022-11-02 19:47:47 +02:00
8c5c07d307
SL-18448 Modified Material Editor to match overrides better
2022-11-01 22:20:38 +02:00
e73c5e4ee3
SL-18448 Do not show editor when saving material inworld, only a name prompt
2022-10-31 23:16:37 +02:00
094a8876d6
SL-18446 Material override arrival filtering
2022-10-31 20:12:53 +02:00
35d4124b5e
SL-18446 Material override arrival for selected objects should update material editor
2022-10-29 03:16:16 +03:00
65eec2ca8f
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
2022-10-26 17:22:50 -05:00
8f47657d64
SL-18443 Allow nulling out of override data and implement new override message protocol.
2022-10-26 16:08:28 -05:00
d69c814db9
SL-18446 Terse-update selection set from live material editor #1
2022-10-26 20:55:49 +03:00
89625f9247
SL-18444 Live Material Editor updating with selection
2022-10-26 00:41:59 +03:00
4a1397c621
SL-18414 Smarter material editor's cancel for overrides
2022-10-24 23:35:28 +03:00
88659e9fe7
SL-18105 When saving an object's material to inventory, save the version that as overrides applied.
2022-10-22 15:25:03 -05:00
7135934e50
SL-18105 Fix for crash when attempting to "Edit PBR Material" when there's no PBR material
2022-10-22 11:01:35 -05:00
0cd7c38421
SL-18105 Hook up live material editor to current selection set and implicitly open build floater when editing a PBR material.
2022-10-21 18:05:19 -05:00
0b177c27a0
SL-18008 Mac build fix
2022-10-18 22:08:27 +03:00
7be33594ea
SL-18008 Updated Save and Edit PBR buttons
2022-10-18 20:13:08 +03:00
53e5216b20
Continuing work on SL-17697 Live editing with material overrides.
...
* Fixed Selection usage so material editor no longer hardcoded to a single object/face
* made local preview hack the fallback for when the ModifyMaterialParams cap is missing
2022-10-17 15:48:49 -07:00
a27e701530
SL-18008 Add Save and Edit buttons to right click menu for materials
2022-10-17 23:33:27 +03:00
c6bb0fef90
Fix SL-17697 local_id usage
2022-10-14 14:44:05 -07:00
bda4206627
WIP for SL-18103 and SL-17697 live editing of materials using ModifyMaterialParams cap
2022-10-14 14:44:05 -07:00
2fa8bce1cf
SL-18326 GLTF material functionality in a Notecard
2022-10-08 01:14:22 +03:00
332ddc67de
SL-17653 Small change in material loading order
2022-09-29 23:17:49 +03:00
9346b45188
SL-17653 Multi-material file support for local materials
2022-09-29 22:39:32 +03:00
Brad Linden