Commit Graph

46622 Commits (ade79bc6f6b6269dbcb88f3dff2db6584d0c2f53)

Author SHA1 Message Date
Andrey Kleshchev ade79bc6f6 SL-18677 Disable materials UI when materials caps are not available 2022-11-18 21:15:54 +02:00
Andrey Kleshchev 32663643c7 SL-18668 Only object id is strictly required 2022-11-18 20:00:10 +02:00
Dave Parks 3368fe153e Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-11-18 11:45:29 -06:00
Dave Parks b1dabc0f00 SL-18669 Fix for broken lighting on transparent faces. Optimize handling of "bindDeferredShader" and shadow map setup. 2022-11-18 11:45:04 -06:00
Andrey Kleshchev 7edf1ac66f SL-18666 Allow tabbing between fields in Material editor floater 2022-11-18 16:27:19 +02:00
Andrey Kleshchev 7889f0b170 SL-18668 Don't call makeMap from callback 2022-11-18 15:28:25 +02:00
Dave Parks e2d1af5c4f SL-18154 Profile guided optimizations -- remove some unneeded operations and make LLDrawPoolMaterials less branchy. 2022-11-17 13:35:39 -06:00
Dave Parks d539550252 Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-11-16 16:07:58 -06:00
Andrey Kleshchev 6387fbb378 SL-18648 Simplify permission testing 2022-11-16 23:56:06 +02:00
Sabrina Shanman d934a14b97 Merged in SL-18632 (pull request #1199)
SL-18632: Implement editing GLTF material texture transforms in build floater
2022-11-16 21:38:29 +00:00
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
Dave Parks bc4694e82a Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-11-16 14:49:47 -06:00
Dave Parks 8d2ac419b2 SL-18154 Profile guided optimizations vs release viewer. Trim some unused abilities and remove some more fast timers. 2022-11-16 14:49:17 -06:00
Cosmic Linden 62aa0e807f SL-18632: Un-hide planar align options when editing GLTF textures in build floater 2022-11-16 12:04:16 -08: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
Cosmic Linden fd76c195c8 SL-18632: Implement editing GLTF material texture transforms in build floater 2022-11-15 18:11:27 -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