Andrey Lihatskiy
|
5d7a5001b4
|
Merge commit '9e24b30' into marchcat/maint-c/restore
# Conflicts:
# indra/llmath/v2math.cpp
# indra/llmath/v2math.h
# indra/llmath/v3math.h
# indra/llmath/v4math.h
# indra/llui/llfolderviewitem.cpp
# indra/llui/llfolderviewitem.h
# indra/llui/llfolderviewmodel.h
# indra/llui/llmodaldialog.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llagent.cpp
# indra/newview/llagentcamera.h
# indra/newview/llavatarrenderinfoaccountant.cpp
# indra/newview/llconversationmodel.h
# indra/newview/llfloaterinventorysettings.cpp
# indra/newview/llfloaternamedesc.cpp
# indra/newview/llfloaternamedesc.h
# indra/newview/llfloaterobjectweights.cpp
# indra/newview/llfloaterobjectweights.h
# indra/newview/llfolderviewmodelinventory.h
# indra/newview/llinspecttexture.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorygallery.h
# indra/newview/llinventorygallerymenu.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmaterialeditor.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitgallery.h
# indra/newview/lloutfitslist.cpp
# indra/newview/lloutfitslist.h
# indra/newview/llpanelgroupcreate.cpp
# indra/newview/llpanelgroupgeneral.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelwearing.cpp
# indra/newview/llreflectionmap.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llteleporthistorystorage.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltexturefetch.cpp
# indra/newview/lltexturefetch.h
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewercamera.cpp
# indra/newview/llviewercamera.h
# indra/newview/llviewermenufile.cpp
# indra/newview/llviewerobject.h
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/tests/llviewerassetstats_test.cpp
|
2025-04-10 06:01:50 +03:00 |
|
Andrey Kleshchev
|
5af750a130
|
#3450 Crash at LLViewerMediaTexture::setPlaying
|
2025-01-22 16:06:30 +02:00 |
|
Ansariel Hiller
|
f782f5f534
|
Fix copy&paste error in LLPanelFace (#2233)
|
2024-08-09 00:21:28 +03:00 |
|
Alexander Gavriliuk
|
e20e387d48
|
#1922 Make PBR scale and offset crosshair work (fix PBR channels in LLPanelFace)
|
2024-08-07 20:25:32 +02:00 |
|
Alexander Gavriliuk
|
413ece6c48
|
#1922 Make PBR scale and offset crosshair work (store control pointers in LLPanelFace)
|
2024-08-07 19:11:52 +02:00 |
|
Alexander Gavriliuk
|
93164fc560
|
#1922 Make PBR scale and offset crosshair work (fix callbacks in LLPanelFace)
|
2024-08-07 16:03:21 +02:00 |
|
Andrey Kleshchev
|
8ae0e6c07a
|
viewer#2102 Update feature notification to notify about Favorites
and remove old notifications
|
2024-07-26 13:43:20 +03:00 |
|
Rye Mutt
|
543dbfee49
|
Reduce findChild stalls in face panel
|
2024-07-25 23:26:52 -04:00 |
|
Ansariel
|
9fdca96f8b
|
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
|
2024-07-08 20:27:14 +02:00 |
|
Ansariel
|
15b3c9f164
|
Fix a few merge issues
|
2024-06-13 02:22:03 +02:00 |
|
Brad Linden
|
40197e8949
|
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
|
2024-06-06 09:46:53 -07:00 |
|
Andrey Kleshchev
|
e60adafa33
|
viewer#1641 Show accurate Alpha mode if asset is missing
|
2024-06-06 15:27:10 +03:00 |
|
Brad Linden
|
a1f49564d6
|
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
|
2024-05-23 11:31:19 -07:00 |
|
Ansariel
|
e2e37cced8
|
Fix line endlings
|
2024-05-22 22:40:26 +03:00 |
|
Ansariel
|
1b67dd855c
|
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
|
2024-05-22 19:04:52 +02:00 |
|
Andrey Lihatskiy
|
b06a99f7c7
|
Post-merge spaces fix
|
2024-05-15 12:47:27 +03:00 |
|
Dave Parks
|
155ddf2336
|
Merge pull request #1421 from secondlife/DRTVWR-600-maint-A
Drtvwr 600 maint a
|
2024-05-07 09:47:37 -05:00 |
|
Alexander Gavriliuk
|
f9473e8afc
|
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
|
2024-05-07 10:18:51 +02:00 |
|
RunitaiLinden
|
c6d752b880
|
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
|
2024-05-06 16:48:58 -05:00 |
|
Andrey Lihatskiy
|
1b68f71348
|
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
|
2024-04-29 07:56:09 +03:00 |
|
Andrey Lihatskiy
|
71ed19839e
|
Merge branch 'main' into DRTVWR-600-maint-A
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterchangeitemthumbnail.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llvovolume.cpp
|
2024-03-27 00:45:06 +02:00 |
|
Cosmic Linden
|
d0458c4853
|
secondlife/viewer#1006: Move blank material constant to indra_constants.h
|
2024-03-18 13:57:01 -07:00 |
|
Ansariel
|
60d3dd98a4
|
Convert remaining BOOL to bool
|
2024-02-21 23:14:31 +02:00 |
|
Ansariel
|
a5261a5fa8
|
Convert BOOL to bool in llui
|
2024-02-21 03:00:25 +02:00 |
|
Brad Linden
|
846337483c
|
Merge branch 'release/materials_featurette' into release/gltf-maint2
|
2024-02-09 09:47:19 -08:00 |
|
Andrey Kleshchev
|
8075cf04c4
|
Issue #26 Support texture drop onto PBR materials
|
2024-02-02 23:51:56 +02:00 |
|
RunitaiLinden
|
9c378ca1e7
|
Merge pull request #703 from secondlife/release/gltf-maint2
Release/gltf maint2
|
2024-01-30 15:49:35 -06:00 |
|
Andrey Kleshchev
|
3b9a1a44b3
|
SL-20669 Fix missed uuid
|
2024-01-26 17:37:10 +02:00 |
|
Jonathan "Geenz" Goodman
|
373b06398c
|
Merge remote-tracking branch 'origin/release/materials_featurette' into DRTVWR-583
|
2024-01-24 14:37:33 -08:00 |
|
Andrey Kleshchev
|
869712e273
|
SL-20669 Move constants out of settings.xml
UIImgInvisibleUUID doesn't exist
Default normal for material is 'null'
|
2024-01-24 17:40:01 +02:00 |
|
Andrey Kleshchev
|
390a5031dc
|
SL-19555 Fix picker failing to highlight default material in inventory
|
2024-01-10 01:43:36 +02:00 |
|
Andrey Kleshchev
|
4392f1bc8f
|
SL-20748 Fix library materials not being previewable on an object
|
2024-01-05 20:03:14 +02: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 |
|
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 |
|
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 |
|
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 |
|
Jonathan "Geenz" Goodman
|
32bfafca4d
|
Merge branch 'DRTVWR-559' into DRTVWR-583
|
2023-09-29 04:34:12 -07: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 |
|
Jonathan "Geenz" Goodman
|
73870cb0b4
|
Merge branch 'DRTVWR-559' into DRTVWR-583
|
2023-09-25 09:27:49 -07: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 |
|
Jonathan "Geenz" Goodman
|
4192cfc1ea
|
Merge branch 'DRTVWR-559' into DRTVWR-583
|
2023-09-09 14:52:06 -07: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 |
|
Jonathan "Geenz" Goodman
|
c5bfe86915
|
Merge branch 'DRTVWR-559' into DRTVWR-583
|
2023-08-29 03:40:10 -07:00 |
|
Jonathan "Geenz" Goodman
|
fbecd348f8
|
Add protocol level mirror support, and UI.
|
2023-08-29 03:04:04 -07:00 |