summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelface.cpp
AgeCommit message (Collapse)Author
2022-09-23SL-18134 Rename Albedo to Base Color to be more consistent with GLTF specDave Parks
2022-09-22SL-17999 'copy' functionality for 'features' and 'texture' tabsAndrey Kleshchev
And a fix to prevent message spam
2022-09-16DRTVWR-559 Fixed merge conflictsAndrey Kleshchev
2022-09-16Merge branch master (DRTVWR-571) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h
2022-09-13SL-17653 Removed unneeded combo boxAndrey Kleshchev
2022-09-05SL-17999 Small cleanupAndrey Kleshchev
2022-09-02SL-17999 PBR should reuse texture possition channels from normal materialsAndrey Kleshchev
2022-09-01SL-17653 Finalized texure picker's local filteringAndrey Kleshchev
2022-09-01SL-17999 PBR material in tool's texture tabAndrey Kleshchev
2022-08-30SL-18038 Remove placeholder "save as material" buttonDave Parks
2022-08-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-08-04DRTVWR-544 Post-merge build fixAndrey Lihatskiy
2022-08-04Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/llpanelobject.cpp
2022-05-06SL-17198 more fixes to get material asset serialization working betterBrad Kittenbrink
2022-05-06SL-17198 fixes to get material asset serialization working betterBrad Kittenbrink
2022-05-06Merge remote-tracking branch 'origin/DRTVWR-559' into ↵Brad Kittenbrink
brad/SL-17116-material-messaging
2022-05-06SL-17198 material asset uploading now suuceeeds.Brad Kittenbrink (Brad Linden)
2022-05-05SL-17325 apply inventory material to faceDave Houlton
2022-04-29SL-17116, SL-17277 single-face material save onlyDave Houlton
2022-04-28Merge remote-tracking branch 'origin/euclid-17277' into ↵Brad Kittenbrink
brad/SL-17116-material-messaging
2022-04-28Beginning viewer side work for SL-17198 new asset and inventory types for ↵Brad Kittenbrink
Materials
2022-04-28Add a (broken) material upload handler fxnDave Houlton
2022-04-27Test UI for SL-17116. provide a debug interface to set a MaterialID for a faceBrad Kittenbrink
2022-04-27Prototype a SaveMaterial buttonDave Houlton
2022-04-26SL-16026 FIXED Copying only one diffuse texture allows pasting this texture ↵Mnikolenko Productengine
into other types of textures
2022-04-19SL-17231 Copying textures should be disabled if object content was not yet ↵Mnikolenko Productengine
updated
2022-04-15SL-17204 FIXED The texture with full permissions is settled on the prim ↵Mnikolenko Productengine
after copying texture from the object with texture with no transfer permission
2022-02-01SL-16344 #6 Fixed 'choose media' button not working in some casesAndrey Kleshchev
2022-01-18SL-16344 #5 CleanupAndrey Kleshchev
2022-01-17SL-16344 #4 Only load 'title' media if it is neededAndrey Kleshchev
Mostly for the sake of MAC. setVolume(0) doesn't work on MAC which resulted in invisible media playing in background when editor was open.
2022-01-17SL-16344 #3 Moved LLPanelFace related code into LLPanelFaceAndrey Kleshchev
2021-11-16Merge branch 'master' into DRTVWR-486Andrey Lihatskiy
# Conflicts: # indra/newview/VIEWER_VERSION.txt # indra/newview/llpanelvolume.cpp # indra/newview/llpanelvolume.h
2021-10-25SL-16218 treat texture selection similar to diffuse map handling.Mnikolenko Productengine
2020-09-28Merged master(DRTVWR-497) into DRTVWR-486Andrey Kleshchev
2020-09-23Merge branch 'master' into DRTVWR-486Andrey Lihatskiy
2020-09-22Merge branch 'master' v6.4.9 into DRTVWR-497Dave Houlton
2020-07-02SL-12688 Fixed WarningAndrey Kleshchev
2020-07-02SL-12334 Texture UUID is not copied to clipboard from a full-perms objectAndrey Kleshchev
2020-06-25SL-12688 Restored stricter permission requirementsAndrey Kleshchev
You need to own texture in inventory to be able to copy it
2020-06-24SL-12688 Warnings part #2Andrey Kleshchev
2020-06-23SL-12688 Warnings part #1Andrey Kleshchev
2020-06-19SL-13359 #9.5 Texture tabAndrey Kleshchev
2020-06-19SL-13359 #9 Texture tabAndrey Kleshchev
2020-06-19SL-13359 #8 Reverted changes to texture tabAndrey Kleshchev
This reverts commit 1e1707d532560583744bb877adfed11864f2db31.
2020-06-17SL-13359 #5 Implemented revised changesAndrey Kleshchev
2020-06-02SL-13359 #1 Revert floater_tools and object panel changesAndrey Kleshchev
2020-04-26Post-merge build fixesAndrey Lihatskiy
2020-02-19SL-12473 FIXED Copied texture params get duplicated when pasting to objects ↵maxim_productengine
that use different face counts.
2020-02-03Merge branch 'DRTVWR-501' into trunkAndrey Lihatskiy
2019-12-16SL-12453 FIXED The "Align planar faces" checkbox is visible in the Default ↵maxim_productengine
mapping mode