Ansariel 3bd76c0fea Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master ... # Conflicts: # indra/newview/VIEWER_VERSION.txt # indra/newview/llfasttimerview.cpp # indra/newview/skins/default/xui/en/widgets/color_swatch.xml # indra/newview/skins/default/xui/en/widgets/texture_picker.xml		2024-01-09 09:37:38 +01:00
..
tests	…
CMakeLists.txt	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer	2023-10-11 12:58:24 +02:00
legacy_object_types.h	…
lldaeloader.cpp	Merge branch 'DRTVWR-596' of https://github.com/secondlife/viewer	2023-12-03 14:56:30 +01:00
lldaeloader.h	…
llgltfloader.cpp	…
llgltfloader.h	…
llgltfmaterial.cpp	Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into DRTVWR-596	2023-11-15 10:32:18 -06:00
llgltfmaterial.h	SL-20523 Local textures not updating on PBR Materials #5	2023-11-06 18:29:42 +02:00
llgltfmaterial_templates.h	SL-20225: LLGLTFMaterial code sync	2023-10-09 16:05:58 -07:00
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-ll-master	2024-01-09 09:37:38 +01:00
llmodel.h	…
llmodelloader.cpp	…
llmodelloader.h	…
llprimitive.cpp	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer	2023-11-20 13:05:41 +01:00
llprimitive.h	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer	2023-11-20 13:05:41 +01:00
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	…