Ansariel f00f624b8b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # doc/contributions.txt # indra/llcommon/llerrorthread.cpp		2023-07-18 00:45:10 +02:00
..
tests	…
CMakeLists.txt	Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer	2022-09-17 23:12:34 +02:00
legacy_object_types.h	…
lldaeloader.cpp	Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer	2022-08-04 16:52:34 +02:00
lldaeloader.h	[FIRE-32599] Local Mesh - Add Support for broken collada (autodesk)	2023-02-05 01:24:27 +00:00
lllslconstants.h	…
llmaterial.cpp	SL-18882: Show diffuse non-alpha textures opaque on editing	2023-02-27 08:15:29 +01:00
llmaterial.h	Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer	2023-03-22 17:35:43 +01:00
llmaterialid.cpp	…
llmaterialid.h	SL-19159 Faster LLUUID and LLMaterialID hashing for std and boost containers keys (#70)	2023-02-07 14:51:53 +02:00
llmaterialtable.cpp	…
llmaterialtable.h	…
llmediaentry.cpp	…
llmediaentry.h	…
llmodel.cpp	Merge branch 'contribute' of https://github.com/secondlife/viewer	2023-03-01 12:54:24 +01:00
llmodel.h	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-12-12 22:09:54 +01:00
llmodelloader.cpp	Merge branch 'contribute' of https://github.com/secondlife/viewer	2023-03-01 12:54:24 +01: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	…