phoenix-firestorm/indra/llprimitive
Andrey Lihatskiy 3da7a50b71 Merge branch 'master' into DRTVWR-543-maint
# Conflicts:
#	autobuild.xml
#	indra/cmake/LLCommon.cmake
#	indra/llcommon/CMakeLists.txt
#	indra/llrender/llgl.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llflexibleobject.cpp
#	indra/newview/llvovolume.cpp
2022-05-27 02:51:33 +03:00
..
tests
CMakeLists.txt
legacy_object_types.h
lldaeloader.cpp Merge branch 'master' (DRTVWR-557) into DRTVWR-546 2022-03-01 13:41:42 +02:00
lldaeloader.h
lllslconstants.h
llmaterial.cpp
llmaterial.h
llmaterialid.cpp
llmaterialid.h
llmaterialtable.cpp
llmaterialtable.h
llmediaentry.cpp
llmediaentry.h
llmodel.cpp Merge branch 'master' into DRTVWR-543-maint 2022-05-27 02:51:33 +03:00
llmodel.h Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546 2021-11-29 20:33:13 +02:00
llmodelloader.cpp
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