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

512 Commits (cd4883fcccb98887d1bf983beb18a8cffbd47e68)

Author SHA1 Message Date
Ansariel cd4883fccc Merge branch 'DRTVWR-601' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/skins/default/xui/en/strings.xml
 2024-01-09 11:30:13 +01:00
Andrey Kleshchev 4392f1bc8f SL-20748 Fix library materials not being previewable on an object 2024-01-05 20:03:14 +02:00
Ansariel 6f49b2609e Merge branch 'DRTVWR-596' of https://github.com/secondlife/viewer 2023-12-15 23:36:05 +01:00
Ansariel 8f27305e5d Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2023-12-15 23:35:39 +01:00
Andrey Kleshchev 1b1457154d SL-20715 Mask cutoff not copied corretly in build tools 2023-12-14 18:19:00 +02:00
Andrey Kleshchev 2d3b52d02e SL-20715 Mapping mode and specular color not copied correctly 
and fixed diffuse alpha
 2023-12-13 12:53:19 +02:00
Ansariel 48c1225f9b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-12-12 12:20:02 +01:00
Ansariel 2c4576f818 FIRE-33497: Fix specular color not copied when copy/pasting texture parameters 2023-12-11 13:24:08 +01:00
Ansariel f83afbc368 Merge branch 'DRTVWR-596' of https://github.com/secondlife/viewer 2023-12-09 15:00:12 +01:00
Maxim Nikolenko 7398efb1f4
SL-20701 FIXED Build tool texture tab shows incorrect material parameters in some cases 2023-12-08 20:15:47 +02:00
Ansariel 4275b1ade8 Merge branch 'DRTVWR-596' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llprimitive/lldaeloader.cpp
#	indra/llprimitive/llmodel.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llviewermenufile.cpp
#	indra/newview/skins/default/xui/en/floater_snapshot.xml
 2023-12-03 14:56:30 +01:00
Maxim Nikolenko 88aefc95ea
SL-20655 FIXED Texture permissions not enforced in Material floaters 2023-11-30 17:47:46 +02:00
Maxim Nikolenko b96ca755b3
SL-20647 don't allow dragging 'no mod' material into the picker of an attached object 2023-11-29 16:46:10 +02:00
Cosmic Linden ba1f87b36e SL-20553: Fix crash in ~PBRPickerAgentListener 2023-11-17 13:26:08 -08:00
Cosmic Linden 711354c2f5 SL-20553: Save material button in build floater now depends on agent inventory rather than object inventory 2023-11-09 13:54:41 -08:00
Ansariel 456b7f9ba7 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llselectmgr.cpp
 2023-11-01 13:46:17 +01:00
Maxim Nikolenko e154fee226
SL-20541 Reorder radio buttons in Edit tools Texture tab to match order in a Material 2023-10-30 16:40:04 +02:00
Ansariel 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
Andrey Kleshchev 1b493d5690 SL-20343 Material floater was disconnected from object's face 2023-09-28 03:55:43 +03:00
Maxim Nikolenko 6e32993c87
SL-20338 FIXED Texture tab Material drop-down does not change if same numbered face is selected 2023-09-26 13:59:31 +03:00
Ansariel 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
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
Ansariel 9c338b3167 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llpanelface.cpp
 2023-09-07 15:47:51 +02:00
Cosmic Linden ab66df94cb SL-20167: Also check permission on paste to be certain 2023-09-06 11:02:31 -07:00
Cosmic Linden 05c8ef3f3c SL-20167: Grey out the clipboard when copying the material to clipboard is not allowed 2023-09-01 17:36:00 -07:00
Ansariel 402595346b Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/installers/windows/installer_template.nsi
 2023-08-24 20:50:27 +02:00
Andrey Kleshchev ef33902f22 SL-20145 GLTF specific feature notification 2023-08-21 19:51:04 +03:00
Ansariel fdee1057aa Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-08-19 13:14:50 +02:00
Ansariel dc42a2b8c7 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llpanelface.cpp
#	indra/newview/skins/default/xui/en/panel_tools_texture.xml
 2023-08-14 21:21:19 +02:00
Cosmic Linden 466914e122 SL-20024: Double-check object inventory is not pending when save button pressed 2023-08-11 17:18:06 -07:00
Cosmic Linden 6c8ced0edd SL-20024: Show loading message when inventory permissions are loading 2023-08-11 16:31:01 -07:00
Cosmic Linden 27842d0c5f SL-20024: Fix material edit/save buttons on build floater sometimes not re-enabling after object inventory load 2023-08-11 16:31:00 -07:00
Cosmic Linden a5d318567c SL-20024: (WIP) (untested) Fix GLTF material permissions in some more edge cases 2023-08-11 16:31:00 -07:00
Cosmic Linden 7bf6103ad9 SL-20024: (WIP) (not tested) Improved behavior for saving material to inventory. Check perms, keep perms. 2023-08-11 16:31:00 -07:00
Cosmic Linden a4030031f8 SL-20024: Do not show material preview for no-modify materials 2023-08-11 16:30:59 -07:00
Cosmic Linden e7e565dc6e SL-20024: Put material in object inventory when material is no-modify or no-transfer 2023-08-11 16:30:49 -07:00
Ansariel fb7d8e2bc1 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-08-11 11:24:23 +02:00
Andrey Kleshchev d8e4572b90 SL-20039 "Save to inventory" should only allow saving identical faces 2023-08-10 21:29:36 +03:00
Andrey Kleshchev 87c00d8daa SL-20133 Shift clicking selected face leaves Editor's Texture tab in a weird state 2023-08-10 17:01:47 +03:00
Ansariel ed67ca001c Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/logcontrol.xml
#	indra/newview/app_settings/settings.xml
#	indra/newview/llpanelface.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
 2023-08-09 11:05:56 +02:00
Maxim Nikolenko 4705515e78
SL-19303 switch automatically between Materials/PBR/Media based on current values 2023-08-03 20:29:30 +03:00
Ansariel 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
Andrey Kleshchev 5e344813dc SL-18396 PBR and blinn phong should not be allowed to be edited together 2023-07-27 23:26:46 +03:00
Ansariel e85546fc3d Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
 2023-07-18 11:17:02 +02:00
Ansariel 289fb458f3 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	doc/contributions.txt
#	indra/llprimitive/llmaterial.h
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpool.cpp
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/llfilepicker.h
#	indra/newview/llpanelface.cpp
#	indra/newview/llviewermenufile.cpp
#	indra/newview/llvovolume.cpp
 2023-07-18 10:59:02 +02:00
Brad Linden 4b268a5d6a Delete unprintable chars that accidentally got into the merge in kdiff3 for DRTVWR-559 2023-07-17 15:32:28 -07:00
Brad Linden f975cfd736 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-07-17 13:37:03 -07:00
Ansariel 133f8108b1 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 2023-07-12 09:26:38 +02:00
Andrey Kleshchev ba4b596894 SL-19141 Fixed applying a no-copy texture to two objects failing silently 2023-07-11 01:24:22 +03:00
Ansariel 1d28a79ec6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	doc/contributions.txt
#	indra/llcharacter/llkeyframemotion.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfilepicker.cpp
 2023-05-18 13:43:48 +02:00