livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
49,337 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

284 Commits (afe91b7eb68da65687beef451bd094ff0091b717)

Author SHA1 Message Date
Andrey Kleshchev afe91b7eb6 Merge main (DRTVWR-596 GLTF Materials Maint) into DRTVWR-591-maint-X 
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
 2024-01-08 21:33:06 +02:00
Maxim Nikolenko 88aefc95ea
SL-20655 FIXED Texture permissions not enforced in Material floaters 2023-11-30 17:47:46 +02:00
Andrey Lihatskiy 27dae1d967 Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-merge 
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llrender/llvertexbuffer.cpp
#	indra/llui/llflatlistview.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldrawpoolground.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorygallery.cpp
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llvosky.cpp
#	indra/newview/skins/default/xui/en/menu_inventory.xml
 2023-11-30 13:30:27 +02:00
RunitaiLinden 361efcb926 Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into DRTVWR-596 2023-11-15 10:32:18 -06:00
cosmic-linden 8d538ef77b
SL-18343: Simple interim GLTF material preview - base color only (#511) 2023-11-14 10:06:45 -06:00
Andrey Kleshchev 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
Andrey Kleshchev fa368f8bcd SL-20372 Picker should remember choice of texture source 2023-10-10 16:39:53 +03:00
Andrey Kleshchev eab9396579 SL-20386 Fix default material recognition in picker's inventory 2023-10-07 19:20:44 +03:00
Andrey Kleshchev 5566f28b03 D559 Post merge fixes 2023-10-03 20:13:23 +03:00
Andrey Lihatskiy 878fb36a0b Merge branch 'main' into DRTVWR-591-maint-X 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventorybridge.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/llvovolume.cpp
 2023-10-03 19:55:49 +03:00
Andrey Kleshchev 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
Andrey Kleshchev b894570e9a SL-19958 Fix default material not droping into texture ctrl 2023-09-28 03:55:43 +03:00
Andrey Kleshchev 226081b275 SL-20334 Unable to use non-square textures from inventory 2023-09-25 20:24:57 +03:00
Andrey Kleshchev 145a5ffe7f SL-15039 Prune unused preferences #3 
DebugInventoryFilters
DebugShowXUINames
DebugSlshareLogTag
DebugStat****
DefaultBlankNormalTexture
DefaultObjectNormalTexture
DefaultObjectSpecularTexture
DefaultUploadCost
DisplayAvatarAgentTarget
DisplayChat
DisplayDebug
DisplayDebugConsole
DisplayIM
DisplayLinden
DisplayRegion
DragAndDropToolTipDelay
DragAndDropDistanceThreshold
DropShadowButton
DropShadowFloater
DropShadowSlider
DropShadowTooltip
UIImgWhiteUUID
UseEnvironmentFromRegion
UseDayCycle
WaterPresetName
SkyPresetName
DayCycleName
DestinationGuideHintTimeout
SidePanelHintTimeout
DisablePrecacheDelayAfterTeleporting
 2023-09-22 19:28:23 +03:00
Andrey Kleshchev 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
Andrey Kleshchev cfb69846f1 SL-20261 Allow and resize existing textures as necessary for thumbnails 2023-09-10 21:49:00 +03:00
Cosmic Linden 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
Andrey Kleshchev 119b02937e SL-19958 An inventory material without asset should default to a blank material #2 2023-07-27 23:20:31 +03:00
Mnikolenko Productengine 1cf4a2c952 SL-20080 Show warning message when selecting a non square texture for thumbnails 2023-07-27 13:30:09 +03:00
Andrey Kleshchev b267515922 SL-20068 Selecting from texture picker for thumbnail does not assign thumbnail 2023-07-25 22:06:23 +03:00
Andrey Kleshchev 7b9206dfd1 SL-20045 Texture picker should apply the exact texture inventory item 2023-07-22 00:51:44 +03:00
Andrey Kleshchev ab18293d35 SL-19929 Picker's warning small adjustment 2023-06-30 00:42:55 +03:00
Andrey Kleshchev 7c100d54dd SL-19928 Make thumbnail selection failures more user friendly 2023-06-29 12:32:51 +03:00
RunitaiLinden d32bca67f1 DRTVWR-559 Add paranoia checks around typecasts of LLGLTFMaterial to LLFetchedGLTFMaterial 2023-04-14 07:36:13 -05:00
Andrey Kleshchev 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
Andrey Kleshchev 17d3f37863 SL-17640 Fix 'Apply now' being enabled when importing 2023-02-16 22:51:29 +02:00
Andrey Kleshchev 81a4c7598d SL-18887 Material size is not displayed in materials picker 2023-01-03 17:32:44 +02:00
Andrey Kleshchev 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
Andrey Kleshchev 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
Andrey Kleshchev 7c489e0480 SL-18648 Clean up unused mNonImmediateFilterPermMask 2022-12-01 05:33:48 +02:00
Andrey Kleshchev d2b8d5b368 SL-17699 Fixed drag and drop into material picker 2022-11-16 23:37:48 +02:00
Andrey Kleshchev 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
Andrey Kleshchev 6d0fcc0e61 SL-17699 Blank material Id for material picker 2022-10-28 20:08:53 +03:00
Andrey Kleshchev 6860df0b98 SL-17699 Enable 'none' button it amterial picker 2022-10-27 20:47:05 +03:00
Andrey Kleshchev 332ddc67de SL-17653 Small change in material loading order 2022-09-29 23:17:49 +03:00
Andrey Kleshchev 9346b45188 SL-17653 Multi-material file support for local materials 2022-09-29 22:39:32 +03:00
Andrey Kleshchev 6afd635da4 SL-18125 Material asset creation pulls wrong set of permissions 2022-09-15 23:12:06 +03:00
Andrey Kleshchev 5034c565bf SL-18044 (PBR) No-copy textures not applying to objects 2022-09-14 01:37:46 +03:00
Andrey Kleshchev 87b55e7293 SL-17653 Removed unneeded combo box 2022-09-13 01:31:10 +03:00
Andrey Kleshchev d2d257cfa9 SL-17653 Fix combo not being visible when needed 2022-09-01 16:05:01 +03:00
Andrey Kleshchev 116bd660b6 SL-17653 Finalized texure picker's local filtering 2022-09-01 13:26:11 +03:00
Andrey Kleshchev 8df1856f84 SL-17653 In texture picker cleaned up permanently invisible 'show folders' checkbox 2022-09-01 13:26:10 +03:00
Andrey Kleshchev 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
Andrey Kleshchev 4f9f7de33b SL-17653 File filter for local materials and textures in texture picker 2022-08-24 19:35:57 +03:00
Andrey Kleshchev 8a91c13947 SL-17653 Local gltf materials #3 2022-08-23 00:23:16 +03:00
Andrey Kleshchev 0d217dc73c SL-17653 Local gltf materials #2 2022-08-23 00:23:05 +03:00
Callum Prentice 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
Callum Prentice 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
Callum Prentice 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
Brad Kittenbrink 38208441db Merge remote-tracking branch 'origin/master' into DRTVWR-559 2022-08-04 10:59:26 -07:00