7c42711ca3
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
2024-06-10 16:22:12 -07:00
7889df945b
Merge remote-tracking branch 'origin/release/materials_featurette' into project/gltf_development
2024-06-04 17:39:39 -07:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02:00
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
e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
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
7ed053d9a2
viewer#1520 Material upload floater displays wrong upload fee
2024-05-21 10:11:44 +03:00
b06a99f7c7
Post-merge spaces fix
2024-05-15 12:47:27 +03:00
155ddf2336
Merge pull request #1421 from secondlife/DRTVWR-600-maint-A
...
Drtvwr 600 maint a
2024-05-07 09:47:37 -05:00
f9473e8afc
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
2024-05-07 10:18:51 +02:00
c6d752b880
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
2024-05-06 16:48:58 -05:00
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
7df1bc9e65
viewer#1081 2K texture apload price arrives as an array #2
2024-04-12 21:53:35 +03:00
e1e0b6fc5b
viewer#1081 Account for 2K texture upload price in bulk upload
2024-04-01 19:30:51 +03:00
18ef2e3b2b
viewer#1081 Account for 2K texture upload price in material and texture upload
2024-04-01 19:30:51 +03:00
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
d0458c4853
secondlife/viewer#1006 : Move blank material constant to indra_constants.h
2024-03-18 13:57:01 -07:00
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
a5261a5fa8
Convert BOOL to bool in llui
2024-02-21 03:00:25 +02:00
9c378ca1e7
Merge pull request #703 from secondlife/release/gltf-maint2
...
Release/gltf maint2
2024-01-30 15:49:35 -06:00
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
19163fd0fe
Allow for upload of 2k textures ( #652 )
...
* SL-20760 Allow 2k texture uploads
* SL-20760 Fix for textures not downloading.
2024-01-18 10:33:02 -06:00
71bcc89776
SL-20669 Material editor uses incorect blank normal maps
2024-01-16 22:52:41 +02:00
b489142cb1
Build fix for Visual Studio update (std::vector<PermissionBit>)
2024-01-10 02:56:56 +01:00
e2de27c84e
Merge branch 'main' into DRTVWR-600-maint-A
...
# Conflicts:
# indra/newview/llmaterialeditor.cpp
2024-01-08 23:38:28 +02:00
74c8b028d4
SL-20743 Use LLMutex in LLImageBase for internal data thread-safety
2023-12-21 19:12:52 +01:00
e104f7ce02
DRTVWR-600 windows build fix
2023-12-20 18:11:53 +01:00
575dc8f410
SL-20754 Modify default midday to be a better approximation of Cloud Layers HDRI (addresses blue sheen).
2023-12-19 15:36:34 -06:00
dc1676af27
SL-20734 Uploaded Materials should use 'Uploads' permissions
2023-12-15 00:41:40 +02:00
88aefc95ea
SL-20655 FIXED Texture permissions not enforced in Material floaters
2023-11-30 17:47:46 +02:00
361efcb926
Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into DRTVWR-596
2023-11-15 10:32:18 -06:00
843866d193
Drtvwr 596 11/8/2023 ( #501 )
...
* SL-20570 Fix for lossy (and square) normal maps when importing GLTF materials.
* SL-20582 Fix for overriding to alpha mode blend not working. Incidental decruft of dead code (thanks, Rye!)
2023-11-13 13:12:48 -06:00
a66a990165
SL-20553: Fix new material item still sometimes not updating in UI
2023-11-09 13:54:43 -08:00
4ad7e250f3
SL-20553: Fix assert
2023-11-09 13:54:42 -08:00
6ba5954d66
SL-20553: Permissions touch-up
2023-11-09 13:54:42 -08:00
ee8b96f3ef
SL-20553: Clean up dead code
2023-11-09 13:54:42 -08:00
2d69611c47
SL-20553: Fix save material to inventory not working with new agent-based permissions
2023-11-09 13:54:41 -08:00
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
001f2915ea
SL-20570 Fix for lossy (and square) normal maps when importing GLTF materials.
2023-11-06 16:15:52 -06:00
cc089d88ad
SL-20523 Ensure override gets updated before render material
2023-11-06 18:29:42 +02:00
0d8893822d
SL-20523 Local textures not updating on PBR Materials #5
2023-11-06 18:29:42 +02:00
52c60ab3fd
SL-20523 Local textures not updating on PBR Materials #4
2023-11-06 18:29:42 +02:00
3a5b678eba
SL-20523 Local textures not updating on PBR Materials #3
2023-11-06 18:29:42 +02:00
596a63051e
SL-20523 Local textures not updating on PBR Materials #2
2023-11-06 18:29:42 +02:00
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
89fe8d6133
Update llmaterialeditor.cpp
...
SL-20392
2023-10-17 15:37:36 -07:00
4db38a86cb
Update llmaterialeditor.cpp
...
SL-20392
2023-10-17 15:31:48 -07:00
b877e80d70
SL-20464 Don't allow enetring non-unicode material name
2023-10-13 20:08:02 +03:00
5566f28b03
D559 Post merge fixes
2023-10-03 20:13:23 +03:00
1b493d5690
SL-20343 Material floater was disconnected from object's face
2023-09-28 03:55:43 +03:00
Brad Linden