a831237e29
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llimage/llimage.h
# indra/llkdu/llimagej2ckdu.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreference.h
# scripts/messages/message_template.msg.sha1
2024-02-06 17:58:20 +01:00
b489142cb1
Build fix for Visual Studio update (std::vector<PermissionBit>)
2024-01-10 02:56:56 +01:00
e2de27c84e
Merge branch 'main' into DRTVWR-600-maint-A
...
# Conflicts:
# indra/newview/llmaterialeditor.cpp
2024-01-08 23:38:28 +02:00
74c8b028d4
SL-20743 Use LLMutex in LLImageBase for internal data thread-safety
2023-12-21 19:12:52 +01:00
e104f7ce02
DRTVWR-600 windows build fix
2023-12-20 18:11:53 +01:00
4275b1ade8
Merge branch 'DRTVWR-596' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llviewermenufile.cpp
# indra/newview/skins/default/xui/en/floater_snapshot.xml
2023-12-03 14:56:30 +01:00
88aefc95ea
SL-20655 FIXED Texture permissions not enforced in Material floaters
2023-11-30 17:47:46 +02:00
89720cdb59
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
2023-11-20 13:05:41 +01:00
361efcb926
Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into DRTVWR-596
2023-11-15 10:32:18 -06:00
843866d193
Drtvwr 596 11/8/2023 ( #501 )
...
* SL-20570 Fix for lossy (and square) normal maps when importing GLTF materials.
* SL-20582 Fix for overriding to alpha mode blend not working. Incidental decruft of dead code (thanks, Rye!)
2023-11-13 13:12:48 -06:00
a66a990165
SL-20553: Fix new material item still sometimes not updating in UI
2023-11-09 13:54:43 -08:00
4ad7e250f3
SL-20553: Fix assert
2023-11-09 13:54:42 -08:00
6ba5954d66
SL-20553: Permissions touch-up
2023-11-09 13:54:42 -08:00
ee8b96f3ef
SL-20553: Clean up dead code
2023-11-09 13:54:42 -08:00
2d69611c47
SL-20553: Fix save material to inventory not working with new agent-based permissions
2023-11-09 13:54:41 -08:00
711354c2f5
SL-20553: Save material button in build floater now depends on agent inventory rather than object inventory
2023-11-09 13:54:41 -08:00
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
001f2915ea
SL-20570 Fix for lossy (and square) normal maps when importing GLTF materials.
2023-11-06 16:15:52 -06:00
cc089d88ad
SL-20523 Ensure override gets updated before render material
2023-11-06 18:29:42 +02:00
0d8893822d
SL-20523 Local textures not updating on PBR Materials #5
2023-11-06 18:29:42 +02:00
52c60ab3fd
SL-20523 Local textures not updating on PBR Materials #4
2023-11-06 18:29:42 +02:00
3a5b678eba
SL-20523 Local textures not updating on PBR Materials #3
2023-11-06 18:29:42 +02:00
596a63051e
SL-20523 Local textures not updating on PBR Materials #2
2023-11-06 18:29:42 +02:00
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
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
89fe8d6133
Update llmaterialeditor.cpp
...
SL-20392
2023-10-17 15:37:36 -07:00
4db38a86cb
Update llmaterialeditor.cpp
...
SL-20392
2023-10-17 15:31:48 -07:00
b877e80d70
SL-20464 Don't allow enetring non-unicode material name
2023-10-13 20:08:02 +03:00
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
5566f28b03
D559 Post merge fixes
2023-10-03 20:13:23 +03:00
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
1b493d5690
SL-20343 Material floater was disconnected from object's face
2023-09-28 03:55:43 +03:00
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
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
c0bcc3740e
SL-20167: Don't block clipboard if GLTF material is null
2023-09-06 11:47:34 -07:00
acc7f6a271
SL-18125 Fixed default upload permissions being ignored
2023-09-05 19:50:26 +03:00
05c8ef3f3c
SL-20167: Grey out the clipboard when copying the material to clipboard is not allowed
2023-09-01 17:36:00 -07:00
ec1e9d1ff0
FIRE-33196: Fix materials upload conflicting with embedded items in notecards fix
2023-08-26 22:05:55 +02:00
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
fdee1057aa
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
2023-08-19 13:14:50 +02:00
a388c5494e
SL-20024: Fix unable to modify a no-copy material from the build floater
2023-08-18 16:33:26 -07:00
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
466914e122
SL-20024: Double-check object inventory is not pending when save button pressed
2023-08-11 17:18:06 -07:00
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
57cc252fd6
SL-20024: Miscellaneous cleanup
2023-08-11 16:31:02 -07:00
76c8cca936
SL-20024: Fix author attributions not transferring for saved object materials, fix item not renamed
2023-08-11 16:31:01 -07:00
a5d318567c
SL-20024: (WIP) (untested) Fix GLTF material permissions in some more edge cases
2023-08-11 16:31:00 -07:00
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
ca6f465088
SL-20024: Disable material editor on prim when contained material is no mod
2023-08-11 16:30:59 -07:00
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
Ansariel