Andrey Lihatskiy 0465c761a4 Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-merge ... # Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/lldrawpoolground.cpp # indra/newview/llspatialpartition.cpp # indra/newview/lltexturefetch.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml # indra/newview/skins/default/xui/en/floater_stats.xml # indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_performance_preferences.xml		2023-11-30 12:28:26 +02:00
..
tests	SL-19121: Add additional test at request of review	2023-02-15 09:42:35 -08:00
CMakeLists.txt	SL-20225: LLGLTFMaterial code sync	2023-10-09 16:05:58 -07:00
legacy_object_types.h	…
lldaeloader.cpp	Merge remote-tracking branch 'origin/main' into DRTVWR-559	2022-12-12 17:59:34 -08:00
lldaeloader.h	…
llgltfloader.cpp	SL-19353 Mesh importer throws an error when the file extension is upper case	2023-03-10 00:58:21 +02:00
llgltfloader.h	…
llgltfmaterial.cpp	Drtvwr 596 11/8/2023 (#501)	2023-11-13 13:12:48 -06:00
llgltfmaterial.h	SL-20523 Local textures not updating on PBR Materials #5	2023-11-06 18:29:42 +02:00
llgltfmaterial_templates.h	SL-20225: LLGLTFMaterial code sync	2023-10-09 16:05:58 -07:00
lllslconstants.h	…
llmaterial.cpp	SL-20024: Put material in object inventory when material is no-modify or no-transfer	2023-08-11 16:30:49 -07:00
llmaterial.h	SL-20024: Put material in object inventory when material is no-modify or no-transfer	2023-08-11 16:30:49 -07:00
llmaterialid.cpp	…
llmaterialid.h	Merge remote-tracking branch 'origin/main' into DRTVWR-559	2023-08-23 12:26:14 -07:00
llmaterialtable.cpp	…
llmaterialtable.h	…
llmediaentry.cpp	…
llmediaentry.h	…
llmodel.cpp	Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-merge	2023-11-30 12:28:26 +02:00
llmodel.h	Merge branch 'main' into DRTVWR-570-maint-Q	2022-12-12 20:53:11 +02:00
llmodelloader.cpp	Merge remote-tracking branch 'origin/main' into DRTVWR-559	2023-05-17 11:17:48 -07:00
llmodelloader.h	…
llprimitive.cpp	Drtvwr 596 11/8/2023 (#501)	2023-11-13 13:12:48 -06:00
llprimitive.h	Drtvwr 596 11/8/2023 (#501)	2023-11-13 13:12:48 -06:00
llprimlinkinfo.h	…
llprimtexturelist.cpp	…
llprimtexturelist.h	…
lltextureanim.cpp	…
lltextureanim.h	…
lltextureentry.cpp	SL-19564 Rebalance exposure and sky. Hack legacy diffuse map saturation and brightness to allow ACES Hill all the time.	2023-04-11 15:09:58 -05:00
lltextureentry.h	SL-18458 Make LLVOCache the one source of truth on most recently received overrides. (#147)	2023-04-03 15:22:40 -07:00
lltree_common.h	…
lltreeparams.cpp	…
lltreeparams.h	…
llvolumemessage.cpp	…
llvolumemessage.h	…
material_codes.cpp	…
material_codes.h	…
object_flags.h	…