livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
71,405 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

136 Commits (fdee1057aa4e8a28a808b81dc18b35cab68bcd0b)

Author SHA1 Message Date
Ansariel fdee1057aa Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-08-19 13:14:50 +02:00
Ansariel dc42a2b8c7 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llpanelface.cpp
#	indra/newview/skins/default/xui/en/panel_tools_texture.xml
 2023-08-14 21:21:19 +02:00
Cosmic Linden 466914e122 SL-20024: Double-check object inventory is not pending when save button pressed 2023-08-11 17:18:06 -07:00
Cosmic Linden 076a02e2d8 SL-20024: Strike a better balance with saved material permissions handling, w/r/t author intent and being easier to understand 2023-08-11 16:31:02 -07:00
Cosmic Linden 57cc252fd6 SL-20024: Miscellaneous cleanup 2023-08-11 16:31:02 -07:00
Cosmic Linden 76c8cca936 SL-20024: Fix author attributions not transferring for saved object materials, fix item not renamed 2023-08-11 16:31:01 -07:00
Cosmic Linden a5d318567c SL-20024: (WIP) (untested) Fix GLTF material permissions in some more edge cases 2023-08-11 16:31:00 -07:00
Cosmic Linden 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
Cosmic Linden ca6f465088 SL-20024: Disable material editor on prim when contained material is no mod 2023-08-11 16:30:59 -07:00
Ansariel e85546fc3d Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
 2023-07-18 11:17:02 +02:00
Brad Linden df1eb38b21 SL-19999 stop outputing debug info about created material asset id unnecessarily 2023-07-13 10:18:54 -07:00
Zi Ree d61d70e19d Linux: make it build 2023-04-16 18:19:07 +02:00
Andrey Kleshchev b30cde2a05 SL-19392 Disable "Double Sided" by default when importing double sided materials 2023-03-21 21:31:18 +02:00
Dave Parks 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
Andrey Kleshchev 17d3f37863 SL-17640 Fix 'Apply now' being enabled when importing 2023-02-16 22:51:29 +02:00
cosmic-linden ba7a333969
Merge pull request #73 from secondlife/SL-19080 
SL-19080: GLTF Material asset consistency: Part 2: Update viewer GLTF Material asset upload to v1.1
 2023-02-14 11:40:32 -08:00
Cosmic Linden 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
Brad Linden dc1dd7a274 Fix some unused variable warnings in DRTVWR-559 2023-02-02 12:26:59 -08:00
Andrey Kleshchev 503e18fc64 SL-19005 Fix 'save as' button for local uploads 2023-01-27 17:22:57 +02:00
Andrey Kleshchev a3f43b4b73 SL-19014 Sanitize the override data sent for faces without GLTF materials 2023-01-23 20:36:54 +02:00
Andrey Kleshchev 7c853be544 SL-19005 Fix save button for local uploads 2023-01-23 18:50:07 +02:00
Andrey Kleshchev 10a4319c30 SL-18962 PBR Materials should be viewable even if they are no-copy 2023-01-12 19:03:36 +02:00
Andrey Kleshchev 3e1afc3c91 SL-18947 No modify materials can lock material floater 
Not supposed to happen, yet somehow did
 2023-01-11 23:56:41 +02:00
Andrey Kleshchev 76c6f3f002 SL-18741 Don't allow bulk upload without caps 2022-12-07 21:21:03 +02:00
akleshchev 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
Maxim Nikolenko c033278ec2 SL-18795 Overrides are not applied to one face 2022-12-07 01:32:01 +02:00
Andrey Kleshchev 321c7895d0 SL-18741 Basic bulk upload for gltf materials #1 2022-12-02 10:24:23 +02:00
Andrey Kleshchev c0f598c103 SL-18725 Texture picker should explain why dropping texture isn't allowed 
Show a tooltip on drag&drop
 2022-12-01 21:43:20 +02:00
Andrey Kleshchev 7c489e0480 SL-18648 Clean up unused mNonImmediateFilterPermMask 2022-12-01 05:33:48 +02:00
cosmic-linden c99c24939a
Merge pull request #16 from secondlife/SL-18732 
Sl 18732: Fix responsiveness of GLTF texture transform controls in build floater
 2022-11-30 09:27:22 -08:00
Cosmic Linden bfcb07270e SL-18732: Review feedback 2022-11-29 15:20:44 -08:00
Cosmic Linden 361571cdb3 SL-18732: Use override update callback for LLMaterialEditor::updateLive as well 2022-11-29 13:51:23 -08:00
Andrey Kleshchev 9f7967fcdc SL-18727 Save material to Inventoryshould prioritize picked face 2022-11-29 23:36:37 +02:00
Andrey Kleshchev 32984b56ea SL-18701 llsd is not thread safe, parse it before using 2022-11-24 20:58:05 +02:00
Andrey Kleshchev 6387fbb378 SL-18648 Simplify permission testing 2022-11-16 23:56:06 +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 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 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 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 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 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
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
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 11c87378be SL-18560 Make local materials save correctly from right-click menu 2022-11-04 18:57:48 +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 d042ad67ed SL-18448 Make material editor's scroll smarter 2022-11-02 19:47:47 +02:00
Dave Parks 32cc9a71d0 Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559 2022-11-02 12:17:28 -05:00