81a4c7598d
SL-18887 Material size is not displayed in materials picker
2023-01-03 17:32:44 +02: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
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
d2b8d5b368
SL-17699 Fixed drag and drop into material picker
2022-11-16 23:37:48 +02: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
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
6afd635da4
SL-18125 Material asset creation pulls wrong set of permissions
2022-09-15 23:12:06 +03:00
5034c565bf
SL-18044 (PBR) No-copy textures not applying to objects
2022-09-14 01:37:46 +03:00
87b55e7293
SL-17653 Removed unneeded combo box
2022-09-13 01:31:10 +03: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
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
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
014d7616b6
Merge branch master (DRTVWR-561) into DRTVWR-483
2022-08-04 00:15:15 +03:00
6a2ae7da10
SL-17640 Fix texture picker not enabling 'apply now'
2022-06-27 22:54:09 +03:00
0bc7fee11f
SL-17640 Materials Upload UI #1
...
1. Allow 'none' textures
2. Disable 'apply now' buttons
3. Switch from loading dae files to just gltf glb
2022-06-24 08:36:50 +03:00
bbdbd6c2dd
SL-17204 FIXED The texture with full permissions is settled on the prim after copying texture from the object with texture with no transfer permission
2022-04-15 22:14:38 +03:00
0c5a621e29
Merge branch 'master' into DRTVWR-486
2021-04-01 20:49:55 +03:00
0bf68ce736
Merge branch 'master' into DRTVWR-483
2021-04-01 20:49:45 +03:00
a9f70ec80e
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/lltexturectrl.h
2020-09-28 22:21:50 +03:00
4c69f9ebb1
Merged master(DRTVWR-497) into DRTVWR-486
2020-09-28 21:21:29 +03:00
42fa322e76
Merged master (DRTVWR-497) into DRTVWR-514-keymappings
2020-09-28 21:21:13 +03:00
966f1ac84e
Merge branch 'master' into DRTVWR-486
2020-09-23 01:48:27 +03:00
f4bfaeb45e
Merge branch 'master' into DRTVWR-483
2020-09-23 01:48:13 +03:00
86e7cc3d35
Merge branch 'master' v6.4.9 into DRTVWR-497
2020-09-22 15:28:13 -06:00
c2b55c4362
Merged master(DRTVWR-503) into DRTVWR-514-keymappings
2020-09-22 22:54:36 +03:00
f3216ca1cd
SL-12688 Warnings part #2
2020-06-24 19:00:48 +03:00
0d78aa31e2
SL-6109 Removed LLDrawFrustum and used changes from EEP to prevent merge conflicts
2020-06-23 14:50:59 +03:00
2022c91e2d
Backed out changeset: 19f3fa6e3e63
2020-06-23 14:50:59 +03:00
0147a8c989
SL-6109 Implemented LLDrawFrustum
2020-06-23 14:49:39 +03:00
1310fac3b1
SL-13359 #5 Implemented revised changes
2020-06-17 23:39:42 +03:00
efc3715713
Buildfix
2020-05-05 01:31:22 +03:00
ec9b989863
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-05-05 00:37:16 +03:00
4cf4243573
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/de/floater_preview_texture.xml
# indra/newview/skins/default/xui/es/floater_preview_texture.xml
# indra/newview/skins/default/xui/fr/floater_preview_texture.xml
# indra/newview/skins/default/xui/it/floater_preview_texture.xml
# indra/newview/skins/default/xui/ja/panel_edit_classified.xml
# indra/newview/skins/default/xui/ja/panel_me.xml
# indra/newview/skins/default/xui/ru/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/floater_picks.xml
# indra/newview/skins/default/xui/tr/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/panel_edit_classified.xml
# indra/newview/skins/default/xui/tr/panel_me.xml
# indra/newview/skins/default/xui/zh/floater_preview_texture.xml
2020-04-21 15:37:25 +03:00
7a311fe30e
Merge branch 'master' into DRTVWR-497
2020-04-20 21:21:12 +03:00
cfb2b95c8c
SL-12641 Remade 'Pick: Texture' floater to eliminate translation overlaps
2020-02-18 18:33:28 +02:00
56056aa198
Upstream merge from viewer-neko
2019-11-27 23:20:03 +02:00
dc1453af9c
Merge in from viewer-release 6.3.5
2019-11-13 16:46:27 -07:00
f83ada32f7
Merged in lindenlab/viewer-release
2019-11-13 10:50:25 +02:00
Andrey Kleshchev