Ansariel 40b731eb76 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568 ... # Conflicts: # .gitignore # indra/cmake/FindOpenJPEG.cmake # indra/cmake/FreeType.cmake # indra/cmake/OpenJPEG.cmake # indra/cmake/UI.cmake # indra/cmake/ViewerMiscLibs.cmake # indra/llwindow/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/viewer_manifest.py		2023-03-21 10:57:56 +01: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	…
lldaeloader.h	[FIRE-32599] Local Mesh - Add Support for broken collada (autodesk)	2023-02-05 01:24:27 +00:00
lllslconstants.h	…
llmaterial.cpp	…
llmaterial.h	[FIRE-32269] rigged hair (esp. animesh) + batching fixes refactored	2022-10-31 20:37:51 +00:00
llmaterialid.cpp	…
llmaterialid.h	…
llmaterialtable.cpp	…
llmaterialtable.h	…
llmediaentry.cpp	…
llmediaentry.h	…
llmodel.cpp	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2023-01-12 12:21:57 +01:00
llmodel.h	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-12-12 22:09:54 +01: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	…