4532e17e3d
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llpanelface.cpp
2023-09-20 15:07:19 +02:00
97ee8b207b
SL-5522 Fix applying textuers and materials with limited restrictions to attachments
...
1. Texture picker now updates filter's permissions based on selection
2. Various panels now properly check permissions
2023-09-19 01:01:43 +03:00
056407518d
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
2023-07-28 18:16:42 +02:00
5a706086fe
SL-20053: Fix sometimes unable to unset a PBR material on a prim.
...
Caused by inventory item asset IDs being null. Seems suspicious. But working around it for now seems best.
2023-07-27 14:44:32 -07:00
119b02937e
SL-19958 An inventory material without asset should default to a blank material #2
2023-07-27 23:20:31 +03:00
9ffb2514db
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/00-Common.cmake
# indra/newview/app_settings/settings.xml
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/llviewermenu.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
2023-04-17 10:01:32 +02:00
d32bca67f1
DRTVWR-559 Add paranoia checks around typecasts of LLGLTFMaterial to LLFetchedGLTFMaterial
2023-04-14 07:36:13 -05:00
f4182ddc7f
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2023-03-06 17:11:43 +01:00
17d3f37863
SL-17640 Fix 'Apply now' being enabled when importing
2023-02-16 22:51:29 +02:00
c2d26cced9
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/pipeline.cpp
2023-01-04 17:10:49 +01:00
81a4c7598d
SL-18887 Material size is not displayed in materials picker
2023-01-03 17:32:44 +02:00
4d8c434846
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llpreviewscript.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
2022-12-08 12:18:18 +01:00
9262c9aead
SL-18197 Materials folder doesn't appear on login
...
Fix some folders not being requested unless already cached.
Fix materials folder not being requested by materials picker.
2022-12-07 05:33:36 +02:00
98f6ece775
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewermenufile.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2022-12-02 19:19:40 +01:00
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
7c489e0480
SL-18648 Clean up unused mNonImmediateFilterPermMask
2022-12-01 05:33:48 +02:00
d5298ac971
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2022-11-20 23:13:06 +01:00
d2b8d5b368
SL-17699 Fixed drag and drop into material picker
2022-11-16 23:37:48 +02:00
a9128731c0
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llpanelface.cpp
# indra/newview/llpreview.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2022-11-01 15:10:11 +01:00
c61224bef2
SL-17699 Hide pipette for material picker
...
At the moment there is no specification how it should work, it can't work like it does for textures due to material overrides.
Also removed some dead code
2022-10-29 00:27:47 +03:00
6d0fcc0e61
SL-17699 Blank material Id for material picker
2022-10-28 20:08:53 +03:00
6860df0b98
SL-17699 Enable 'none' button it amterial picker
2022-10-27 20:47:05 +03:00
4dce4759e4
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-10-01 14:47:34 +02:00
332ddc67de
SL-17653 Small change in material loading order
2022-09-29 23:17:49 +03:00
9346b45188
SL-17653 Multi-material file support for local materials
2022-09-29 22:39:32 +03:00
0d0d1572b1
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-09-26 15:22:19 +02:00
9f0fb244cc
Add parameter to texture picker swatch to allow hiding the label at the bottom, expanding the texture to full height
2022-09-24 03:43:08 +02:00
5178e59b59
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-09-16 09:37:16 +02:00
6afd635da4
SL-18125 Material asset creation pulls wrong set of permissions
2022-09-15 23:12:06 +03:00
82e545fa92
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-09-14 09:22:29 +02:00
5034c565bf
SL-18044 (PBR) No-copy textures not applying to objects
2022-09-14 01:37:46 +03:00
1f176fdc18
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmath/llvolume.cpp
# indra/llrender/llglslshader.cpp
# indra/llrender/llpostprocess.cpp
# indra/llrender/llrender.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewershadermgr.cpp
# indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
2022-09-13 20:11:44 +02:00
87b55e7293
SL-17653 Removed unneeded combo box
2022-09-13 01:31:10 +03:00
d7eeaf42ce
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2022-09-03 13:53:07 +02:00
d2d257cfa9
SL-17653 Fix combo not being visible when needed
2022-09-01 16:05:01 +03:00
116bd660b6
SL-17653 Finalized texure picker's local filtering
2022-09-01 13:26:11 +03:00
8df1856f84
SL-17653 In texture picker cleaned up permanently invisible 'show folders' checkbox
2022-09-01 13:26:10 +03:00
cefc6c4afc
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lllocalbitmaps.h
# indra/newview/llviewerregion.cpp
2022-08-31 09:03:56 +02:00
d19d827121
Merge branch master (DRTVWR-483) into DRTVWR-559
...
# Conflicts:
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lllocalbitmaps.h
# indra/newview/llviewerregion.cpp
# lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-08-31 00:30:49 +03:00
b0f88bef63
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-08-30 11:25:02 +02:00
4f9f7de33b
SL-17653 File filter for local materials and textures in texture picker
2022-08-24 19:35:57 +03:00
8a91c13947
SL-17653 Local gltf materials #3
2022-08-23 00:23:16 +03:00
0d217dc73c
SL-17653 Local gltf materials #2
2022-08-23 00:23:05 +03:00
59884327e2
https://jira.secondlife.com/browse/SL-17699 Integrate GLTF materials with build floater texture tab: First pass - some edge cases remaining. User can now edit an object or set of objects, choose a material and have it apply as expected
2022-08-19 13:14:51 -07:00
694f6c11d1
SL-17699 Add upport for materials to texture picker. MAke sure the default (index 0) option is selected and update filters accordingly at startup
2022-08-17 12:21:01 -07:00
f842aeac30
SL-17699 Add upport for materials to texture picker. A work in progress but I am about to make some larger changes to inventory code so I wanted to secure this first
2022-08-17 10:29:33 -07:00
38208441db
Merge remote-tracking branch 'origin/master' into DRTVWR-559
2022-08-04 10:59:26 -07:00
480c549ee0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-04 15:25:54 +02:00
9f3cbadd29
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-04 14:18:46 +02:00
014d7616b6
Merge branch master (DRTVWR-561) into DRTVWR-483
2022-08-04 00:15:15 +03:00
Ansariel