Andrey Kleshchev 6c54c9f8a9 Merge branch 'main' into DRTVWR-577-maint-S ... # Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm		2023-02-09 22:33:52 +02:00
..
tests	…
CMakeLists.txt	…
legacy_object_types.h	…
lldaeloader.cpp	Merge branch 'master' into DRTVWR-565-maint-P	2022-08-04 00:12:26 +03:00
lldaeloader.h	…
lllslconstants.h	…
llmaterial.cpp	SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha masks.	2021-05-26 10:57:39 -06:00
llmaterial.h	SL-15299 SL-15313 BUG-230802 Revert BOM fix causing issues with avatar alpha masks.	2021-05-26 10:57:39 -06:00
llmaterialid.cpp	…
llmaterialid.h	…
llmaterialtable.cpp	…
llmaterialtable.h	…
llmediaentry.cpp	…
llmediaentry.h	…
llmodel.cpp	Merge branch 'main' into DRTVWR-577-maint-S	2023-02-09 22:33:52 +02:00
llmodel.h	Merge branch 'main' into DRTVWR-570-maint-Q	2022-12-12 20:53:11 +02:00
llmodelloader.cpp	SL-19097 Crash when selecting a model for upload and waiting too long	2023-01-28 02:02:42 +02:00
llmodelloader.h	…
llprimitive.cpp	…
llprimitive.h	…
llprimlinkinfo.h	…
llprimtexturelist.cpp	…
llprimtexturelist.h	…
lltextureanim.cpp	…
lltextureanim.h	…
lltextureentry.cpp	…
lltextureentry.h	…
lltree_common.h	…
lltreeparams.cpp	…
lltreeparams.h	…
llvolumemessage.cpp	…
llvolumemessage.h	…
material_codes.cpp	…
material_codes.h	…
object_flags.h	…