Commit Graph

46608 Commits (d2b8d5b3687efb20f2d74bc7100282a5f3e8693d)

Author SHA1 Message Date
Andrey Kleshchev d2b8d5b368 SL-17699 Fixed drag and drop into material picker 2022-11-16 23:37:48 +02:00
Andrey Kleshchev bfe5e3f289 SL-18648 Material editor should only allow full-perm textures 2022-11-16 23:23:43 +02:00
Geenz 07ada65df1 A few tweaks to SSR while I'm in the neighborhood.
Mostly just making it actually kind of work.  Still needs a lot more tweaking - but can revisit later.
SL-18332
2022-11-16 07:11:13 -08:00
Brad Kittenbrink 911aba0c1c SL-18458 VOCache cleanup region_handle message encoding.
Really wish there were a native way to send S64/U64 values in llsd.
2022-11-15 12:51:28 -08:00
Sabrina Shanman 3cc3e6a5e0 Merged in SL-18634 (pull request #1198)
SL-18634: Fix GLTF material texture transform not serializing when texture ID is null
2022-11-14 23:06:44 +00:00
Cosmic Linden e4dd9c1e64 SL-18634: Fix GLTF material texture transform not serializing when texture ID is null 2022-11-14 14:57:22 -08:00
Sabrina Shanman 5756a0284d Merged in SL-18627 (pull request #1193)
SL-18627: Make space for pbr transform controls in build floater and disable some WIP controls

Approved-by: Andrey Kleshchev
2022-11-14 21:31:08 +00:00
Brad Kittenbrink 1971839517 Basic solution for SL-18458 vocache implementation for material overrides 2022-11-14 11:26:34 -08:00
Jonathan Goodman 97277e74a9 Merged in SL-18332 (pull request #1194)
First pass of Screen Space Reflections

Approved-by: Dave Parks
2022-11-14 18:12:22 +00:00
Dave Parks 843a5c287e SL-18485 Cleanup -- remove unused GLTF specific vertex attributes from LLVertexBuffer (blows past 16-attribute limit) 2022-11-14 11:40:18 -06:00
Nicky 6c93f42325 Use const& as it is illegal to bind a non const reference to a temporary 2022-11-13 11:18:44 +01:00
Andrey Kleshchev cdf248d986 SL-18391 Basic gltf material accounting
Plan is to expand it as needed with overrides, request rate and memory
2022-11-12 00:19:21 +02:00
Andrey Kleshchev 7c67777680 SL-18518 Move 'json to override' work to background thread 2022-11-12 00:19:20 +02:00
Dave Parks 344c5196b4 SL-18566 Fix for legacy transparency being opaque under water. 2022-11-11 15:39:06 -06:00
Dave Parks 8a19c8e073 SL-18615 Fix for beacons not rendering and beacon highlights flickering. 2022-11-11 15:19:41 -06: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
Dave Parks fe2a07a80f SL-18616 Fix for dropping mOverrideAlphaMode on copy 2022-11-11 14:34:57 -06:00
Dave Parks 70f249fbfb SL-18630 Fix for probes often ending up under the terrain. 2022-11-11 13:48:51 -06:00
Andrey Kleshchev 72884b29e5 mac build fix 2022-11-11 01:10:47 +02:00
Andrey Kleshchev 44782e475c SL-18602 Crashfix 2022-11-10 23:50:46 +02:00
Andrey Kleshchev 424593c05e SL-18602 Update server params on drag n drop 2022-11-10 22:18:56 +02:00
Dave Parks 12a86f89e5 SL-18617 Disable fullbright checkbox and color swatch when GLTF material is present. 2022-11-10 14:16:34 -06:00
Dave Parks e2cf375179 SL-18573 Fix for HUD text being wrong color. 2022-11-10 13:54:52 -06:00
Dave Parks 70b8e17f17 Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-11-10 13:21:30 -06:00
Dave Parks 76de36c405 SL-18602 Integrate queueModify/queueApply/queueUpdate into all the places that used to post to ModifyMaterialParams directly. 2022-11-10 13:21:06 -06:00
Andrey Kleshchev 0ecc677b49 SL-18583 Missed flushUpdates 2022-11-10 18:30:41 +02:00
Andrey Kleshchev d68f379786 SL-18583 Fixed incorrect values being applied when returning to a case without override 2022-11-10 17:47:48 +02:00
Dave Parks 34a8cb75bb Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
# Conflicts:
#	indra/newview/llgltfmateriallist.h
2022-11-09 17:13:16 -06:00
Dave Parks 1ed8f7cd0c SL-18602 Fix for applying material asset not removing overrides on drag-and-drop 2022-11-09 17:10:31 -06:00
Andrey Kleshchev a83a4811b5 SL-18518 Move json to material work to background thread 2022-11-09 22:52:30 +02:00
Andrey Kleshchev 14d901f25f SL-18583 Use gltf overrides as a base for live editing to send only minimal changes 2022-11-09 03:12:14 +02:00
Sabrina Shanman 4d961ccbaa Merged in revert-pr-1190 (pull request #1191)
Revert "SL-18523: When editing an object's material override, use the object's material override as a base, rather than its render material (pull request #1190)"
2022-11-09 00:17:22 +00:00
Sabrina Shanman 4aaa484195 Revert "SL-18523: When editing an object's material override, use the object's material override as a base, rather than its render material (pull request #1190)" 2022-11-09 00:16:41 +00:00
Sabrina Shanman ded67322de Merged in SL-18523 (pull request #1190)
SL-18523: When editing an object's material override, use the object's material override as a base, rather than its render material
2022-11-09 00:03:34 +00:00
Andrey Kleshchev dafbed80b4 SL-18583 Copy&Paste support for overrides
And a fix for SL-18583
2022-11-09 00:20:40 +02:00
Cosmic Linden cba87c62cc SL-18523: When editing an object's material override, use the object's material override as a base, rather than its render material 2022-11-08 11:55:45 -08:00
Andrey Kleshchev d72824c2b7 SL-18197 Bump inventory cache version
Issue: release viewer saves materials as AT_UNKNOWN (255). When material viewer loads cache with materials saved as '255' instead of '57', material viewer doesn't know to update content and it casuses issues. Viewer eventally recovers, but it's simpler to drop cache in this case over trying to figure out if our unknown is a material (but may be cache should include asset type count to let viewer know when to double check unknowns).
Also made 'legacy' materials folder's name localizable just in case.
2022-11-08 21:19:13 +02:00
Dave Parks ee6e34c099 Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-11-08 12:23:08 -06:00
Dave Parks 40d01ba393 SL-18585 Batch updates to ModifyMaterialParams capability. 2022-11-08 12:20:59 -06:00
Andrey Kleshchev 080421decb SL-18583 Make Live Material editor restore changes when canceling in texture or color pickers 2022-11-08 01:22:08 +02:00
Andrey Kleshchev 2b1ff7495d SL-18583 Make tools floater restore overrides when canceling changes #1
This works only partially since changes from material editor are not yet tracked.
2022-11-07 18:07:09 +02:00
Andrey Kleshchev c1180f1cc7 SL-18583 Fix race condition when setting multiple faces
And fix cases of updates not applying
2022-11-07 18:07:09 +02:00
Andrey Kleshchev 172366121a SL-18560 Mac build fix 2022-11-04 19:35:16 +02:00
Andrey Kleshchev 11c87378be SL-18560 Make local materials save correctly from right-click menu 2022-11-04 18:57:48 +02:00
Andrey Kleshchev d26f545c5a SL-18391 Fixed local materials failing to load 2022-11-03 19:57:21 +02:00
Mnikolenko Productengine a0c7a7ecdc SL-18548 fix for crash when trying to Save material without caps 2022-11-03 15:17:09 +02:00
Andrey Kleshchev 0f20cf17fd SL-18446 Don't cause excessive udpates #2 2022-11-03 01:36:45 +02:00
Andrey Kleshchev a87505333e SL-18448 Save material button in tools floater 2022-11-03 00:28:21 +02:00
Sabrina Shanman 81011a318e Merged in SL-18485 (pull request #1183)
SL-18485: Render GLTF materials with extension KHR_texture_transform with approprate texture transforms
2022-11-02 20:10:04 +00:00
Dave Parks 106b1a6e6a Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-11-02 14:58:45 -05:00