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

159 Commits (aa7c8eeaefdfa215d70ae5980db280db4817f770)

Author SHA1 Message Date
Ansariel aa7c8eeaef Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llcommon/llprofiler.h
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
 2023-11-07 11:56:19 +01:00
Andrey Kleshchev cc089d88ad SL-20523 Ensure override gets updated before render material 2023-11-06 18:29:42 +02:00
Andrey Kleshchev 0d8893822d SL-20523 Local textures not updating on PBR Materials #5 2023-11-06 18:29:42 +02:00
Andrey Kleshchev 52c60ab3fd SL-20523 Local textures not updating on PBR Materials #4 2023-11-06 18:29:42 +02:00
Andrey Kleshchev 3a5b678eba SL-20523 Local textures not updating on PBR Materials #3 2023-11-06 18:29:42 +02:00
Andrey Kleshchev 596a63051e SL-20523 Local textures not updating on PBR Materials #2 2023-11-06 18:29:42 +02:00
Andrey Kleshchev dc63dfc0dd SL-20523 Local textures not updating on PBR Materials #1 
Update editor in which texture changed to local
 2023-11-06 18:29:42 +02:00
Ansariel 2053458181 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventorybridge.cpp
#	indra/newview/pipeline.h
#	indra/newview/skins/default/xui/en/menu_inventory.xml
 2023-10-18 14:55:45 +02:00
Jonathan "Geenz" Goodman 89fe8d6133 Update llmaterialeditor.cpp 
SL-20392
 2023-10-17 15:37:36 -07:00
Jonathan "Geenz" Goodman 4db38a86cb Update llmaterialeditor.cpp 
SL-20392
 2023-10-17 15:31:48 -07:00
Maxim Nikolenko b877e80d70
SL-20464 Don't allow enetring non-unicode material name 2023-10-13 20:08:02 +03:00
Ansariel 9636801773 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llinventorymodel.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/llviewerinventory.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/skins/default/xui/en/menu_inventory.xml
 2023-10-04 12:28:33 +02:00
Andrey Kleshchev 5566f28b03 D559 Post merge fixes 2023-10-03 20:13:23 +03:00
Ansariel c12c377c61 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
 2023-10-01 18:18:17 +02:00
Andrey Kleshchev 1b493d5690 SL-20343 Material floater was disconnected from object's face 2023-09-28 03:55:43 +03:00
Ansariel 9c338b3167 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llpanelface.cpp
 2023-09-07 15:47:51 +02:00
cosmic-linden 52d973e955
Merge pull request #361 from secondlife/SL-20167 
SL-20167: Grey out the clipboard when copying the material is not allowed
 2023-09-06 15:13:11 -07:00
Cosmic Linden c0bcc3740e SL-20167: Don't block clipboard if GLTF material is null 2023-09-06 11:47:34 -07:00
Andrey Kleshchev acc7f6a271 SL-18125 Fixed default upload permissions being ignored 2023-09-05 19:50:26 +03:00
Cosmic Linden 05c8ef3f3c SL-20167: Grey out the clipboard when copying the material to clipboard is not allowed 2023-09-01 17:36:00 -07:00
Ansariel ec1e9d1ff0 FIRE-33196: Fix materials upload conflicting with embedded items in notecards fix 2023-08-26 22:05:55 +02:00
Ansariel 402595346b Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/installers/windows/installer_template.nsi
 2023-08-24 20:50:27 +02:00
Ansariel fdee1057aa Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-08-19 13:14:50 +02:00
Cosmic Linden a388c5494e SL-20024: Fix unable to modify a no-copy material from the build floater 2023-08-18 16:33:26 -07: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