Ansariel 539959a7f8 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop ... # Conflicts: # .github/workflows/qatest.yaml # indra/newview/llfloatermodelpreview.cpp # indra/newview/llvoavatar.cpp # indra/newview/llwearableitemslist.cpp		2025-08-06 18:47:44 +02:00
..
tests	…
CMakeLists.txt	Merge branch 'release/2025.05' of https://github.com/secondlife/viewer	2025-07-18 14:14:54 +02:00
legacy_object_types.h	…
lldaeloader.cpp	Merge branch 'release/2025.05' of https://github.com/secondlife/viewer	2025-07-27 12:54:37 +02:00
lldaeloader.h	Merge branch 'release/2025.05' of https://github.com/secondlife/viewer	2025-07-18 14:14:54 +02:00
llgltfmaterial.cpp	…
llgltfmaterial.h	…
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 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop	2025-08-06 18:47:44 +02:00
llmodel.h	Merge branch 'release/2025.05' of https://github.com/secondlife/viewer	2025-07-18 14:14:54 +02:00
llmodelloader.cpp	Merge branch 'release/2025.05' of https://github.com/secondlife/viewer	2025-07-27 12:54:37 +02:00
llmodelloader.h	Merge branch 'release/2025.05' of https://github.com/secondlife/viewer	2025-07-27 12:54:37 +02:00
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	…