Ansariel 8a55580fc9 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/cmake/LLPhysicsExtensions.cmake # indra/newview/llvoicewebrtc.cpp		2025-11-17 23:26:11 +01:00
..
tests	…
CMakeLists.txt	Merge branch 'develop' of https://github.com/secondlife/viewer	2025-10-20 23:56:48 +02:00
legacy_object_types.h	…
lldaeloader.cpp	Fix enum type arithmetic deprecation warnings	2025-11-17 16:01:28 +00:00
lldaeloader.h	…
llgltfmaterial.cpp	Fix #4195: Preserve transforms when switching PBR materials (#4725)	2025-10-06 16:52:33 +03:00
llgltfmaterial.h	Fix #4195: Preserve transforms when switching PBR materials (#4725)	2025-10-06 16:52:33 +03:00
llgltfmaterial_templates.h	…
lllslconstants.h	…
llmaterial.cpp	…
llmaterial.h	…
llmaterialid.cpp	…
llmaterialid.h	…
llmaterialtable.cpp	…
llmaterialtable.h	…
llmediaentry.cpp	…
llmediaentry.h	…
llmodel.cpp	Merge branch 'develop' of https://github.com/secondlife/viewer	2025-10-11 18:51:03 +02:00
llmodel.h	Merge branch 'develop' of https://github.com/secondlife/viewer	2025-10-11 18:51:03 +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	…