869c8d1882
Add label / caption color support to texture picker, fix label width setting and remember to also add the required parameters to the skin
2023-12-29 20:32:28 +01: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
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
becc1af2ec
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llvovolume.cpp
2023-10-11 12:58:24 +02:00
fa368f8bcd
SL-20372 Picker should remember choice of texture source
2023-10-10 16:39:53 +03:00
eab9396579
SL-20386 Fix default material recognition in picker's inventory
2023-10-07 19:20:44 +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
0a928bf1fd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llagent.cpp
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsidepaneltaskinfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
2023-10-04 11:38:21 +02:00
ce332e0755
Merge branch 'main' of https://github.com/secondlife/viewer
2023-10-04 02:44:58 +02:00
5566f28b03
D559 Post merge fixes
2023-10-03 20:13:23 +03:00
7d50a51434
Merge branch 'main' (DRTVWR-567) into DRTVWR-559
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llagent.cpp
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsidepaneltaskinfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
# indra/newview/skins/default/xui/en/menu_inventory.xml
2023-10-03 19:00:33 +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
b894570e9a
SL-19958 Fix default material not droping into texture ctrl
2023-09-28 03:55:43 +03:00
226081b275
SL-20334 Unable to use non-square textures from inventory
2023-09-25 20:24:57 +03:00
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
a45c5826dc
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llvovolume.cpp
2023-09-12 14:20:54 +02:00
cfb69846f1
SL-20261 Allow and resize existing textures as necessary for thumbnails
2023-09-10 21:49:00 +03:00
cb1cb4b505
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
2023-07-28 18:20:13 +02: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
1cf4a2c952
SL-20080 Show warning message when selecting a non square texture for thumbnails
2023-07-27 13:30:09 +03:00
b267515922
SL-20068 Selecting from texture picker for thumbnail does not assign thumbnail
2023-07-25 22:06:23 +03:00
4ebb423335
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llaisapi.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/lltexturectrl.cpp
2023-07-22 11:47:19 +02:00
7b9206dfd1
SL-20045 Texture picker should apply the exact texture inventory item
2023-07-22 00:51:44 +03:00
a520340900
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llsidepanelinventory.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/en/panel_outfit_gallery.xml
2023-07-04 14:42:05 +02:00
ab18293d35
SL-19929 Picker's warning small adjustment
2023-06-30 00:42:55 +03:00
7c100d54dd
SL-19928 Make thumbnail selection failures more user friendly
2023-06-29 12:32:51 +03:00
7bcb251661
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llmessage/llcoproceduremanager.cpp
# indra/llui/lllayoutstack.h
# indra/newview/llfloatersidepanelcontainer.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llinventoryfilter.h
# indra/newview/llinventorymodelbackgroundfetch.cpp
# indra/newview/llinventorymodelbackgroundfetch.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
2023-04-21 12:08:40 +02: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
af30c8c95b
SL-19533 Don't try to restart fetchexcessively
...
No real point restarting, but due to significant changes decided to keep this around and raise asserts instead of removing.
2023-04-11 21:20:30 +03: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
Zi Ree