summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-11-10SL-18617 Disable fullbright checkbox and color swatch when GLTF material is ↵Dave Parks
present.
2022-11-10SL-18573 Fix for HUD text being wrong color.Dave Parks
2022-11-10Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-11-10SL-18602 Integrate queueModify/queueApply/queueUpdate into all the places ↵Dave Parks
that used to post to ModifyMaterialParams directly.
2022-11-10SL-18583 Missed flushUpdatesAndrey Kleshchev
2022-11-10SL-18583 Fixed incorrect values being applied when returning to a case ↵Andrey Kleshchev
without override
2022-11-09Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559 # Conflicts: # indra/newview/llgltfmateriallist.h
2022-11-09SL-18602 Fix for applying material asset not removing overrides on drag-and-dropDave Parks
2022-11-09SL-18518 Move json to material work to background threadAndrey Kleshchev
2022-11-09SL-18583 Use gltf overrides as a base for live editing to send only minimal ↵Andrey Kleshchev
changes
2022-11-09Merged in revert-pr-1190 (pull request #1191)Sabrina Shanman
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-09Revert "SL-18523: When editing an object's material override, use the ↵Sabrina Shanman
object's material override as a base, rather than its render material (pull request #1190)"
2022-11-09Merged in SL-18523 (pull request #1190)Sabrina Shanman
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-09SL-18583 Copy&Paste support for overridesAndrey Kleshchev
And a fix for SL-18583
2022-11-08SL-18523: When editing an object's material override, use the object's ↵Cosmic Linden
material override as a base, rather than its render material
2022-11-08SL-18197 Bump inventory cache versionAndrey Kleshchev
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-08Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-11-08SL-18585 Batch updates to ModifyMaterialParams capability.Dave Parks
2022-11-08SL-18583 Make Live Material editor restore changes when canceling in texture ↵Andrey Kleshchev
or color pickers
2022-11-07SL-18583 Make tools floater restore overrides when canceling changes #1Andrey Kleshchev
This works only partially since changes from material editor are not yet tracked.
2022-11-07SL-18583 Fix race condition when setting multiple facesAndrey Kleshchev
And fix cases of updates not applying
2022-11-04SL-18560 Mac build fixAndrey Kleshchev
2022-11-04SL-18560 Make local materials save correctly from right-click menuAndrey Kleshchev
2022-11-03SL-18391 Fixed local materials failing to loadAndrey Kleshchev
2022-11-03SL-18548 fix for crash when trying to Save material without capsMnikolenko Productengine
2022-11-03SL-18446 Don't cause excessive udpates #2Andrey Kleshchev
2022-11-03SL-18448 Save material button in tools floaterAndrey Kleshchev
2022-11-02Merged in SL-18485 (pull request #1183)Sabrina Shanman
SL-18485: Render GLTF materials with extension KHR_texture_transform with approprate texture transforms
2022-11-02Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-11-02SL-18520 Fix for mac build.Dave Parks
2022-11-02SL-18485: Render GLTF materials with extension KHR_texture_transform with ↵Cosmic Linden
approprate texture transforms
2022-11-02SL-18531 Disable texture controls when editing face with materialAndrey Kleshchev
2022-11-02SL-18448 Make material editor's scroll smarterAndrey Kleshchev
2022-11-02Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-11-02SL-18520 Use GLTF material.extras to pass flags for enabling overriding ↵Dave Parks
alpha mode and double sided to default
2022-11-02SL-18522 Use naming consistent with GLTF standardAndrey Kleshchev
2022-11-01SL-18448 Fix metallic and normal controls being swappedAndrey Kleshchev
2022-11-01Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-11-01Increment viewer version to 6.6.8Nat Goodspeed
following promotion of DRTVWR-575
2022-11-01D559 MacOS build fixAndrey Kleshchev
2022-11-01SL-18448 Fixed exit conditionAndrey Kleshchev
2022-11-01SL-18448 Modified Material Editor to match overrides betterAndrey Kleshchev
2022-11-01Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into ↵Dave Parks
DRTVWR-559
2022-11-01SL-18520 WIP - Use off-by-epsilon and special UUID identifier hacks to allow ↵Dave Parks
overriding to default values.
2022-11-01Fix mac build for DRTVWR-559. PROFILE_ZONE_SCOPED macro cant take an argumentBrad Kittenbrink
2022-11-01SL-18391 Removed direct dependency of local materials onto tinygltfAndrey Kleshchev
2022-11-01SL-18513 Put profile markers around GLTF code.Dave Parks
2022-10-31SL-18448 Fix for mac build.Dave Parks
2022-10-31Fix SL-18511 TOS and MFA login failure handlers must cooperate to answer ↵Brad Kittenbrink
both reasons at the same time
2022-10-31SL-18448 Do not show editor when saving material inworld, only a name promptAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 06:30:26 +0000