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
486a7f7877
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/skins/default/xui/en/menu_inventory.xml
2022-06-28 12:01:00 +02:00
6a2ae7da10
SL-17640 Fix texture picker not enabling 'apply now'
2022-06-27 22:54:09 +03:00
536e958018
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/CMakeLists.txt
# indra/newview/llface.cpp
# indra/newview/llfilepicker.h
# indra/newview/llinventoryicon.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/pipeline.cpp
# indra/newview/skins/default/textures/textures.xml
# indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
2022-06-27 17:58:22 +02: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
fbb6b25677
Merge branch 'DRTVWR-486' of https://bitbucket.org/lindenlab/viewer
2022-04-19 18:36:48 +02: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
602a82dc33
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 10:11:43 +01:00
c4feaee655
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 08:51:55 +01:00
2b1a3b22e9
FIRE-30431: Keep radio button mode selection in texture selection
2020-11-05 12:46:32 +01:00
6c0cbbbc1a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-29 13:17:06 +02:00
52d81c3f3b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-28 23:35:33 +02: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
4a9977f19a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 09:48:33 +02:00
4bbdafb17e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 08:31:25 +02:00
efbb274251
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 07:33:20 +02: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
722f7f32bc
Merge branch 'DRTVWR-486' of https://bitbucket.org/lindenlab/viewer
2020-06-25 10:30:06 +02: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
Ansariel