phoenix-firestorm/indra/llprimitive
Ansariel b99cf9fb86 Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/00-Common.cmake
#	indra/cmake/APR.cmake
#	indra/cmake/Audio.cmake
#	indra/cmake/Boost.cmake
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/LLKDU.cmake
#	indra/cmake/LLPrimitive.cmake
#	indra/cmake/Meshoptimizer.cmake
#	indra/cmake/NGHTTP2.cmake
#	indra/cmake/OPENAL.cmake
#	indra/llaudio/llvorbisencode.cpp
#	indra/llcommon/linden_common.h
#	indra/llcommon/llcommon.cpp
#	indra/llcommon/llfasttimer.cpp
#	indra/llcommon/llfasttimer.h
#	indra/llcommon/llfile.cpp
#	indra/llcommon/llmemory.h
#	indra/llcommon/llprofiler.h
#	indra/llcommon/llthreadsafequeue.h
#	indra/llfilesystem/lldir_win32.cpp
#	indra/llkdu/llimagej2ckdu.cpp
#	indra/llkdu/llimagej2ckdu.h
#	indra/llkdu/llkdumem.h
#	indra/llplugin/slplugin/CMakeLists.txt
#	indra/llrender/llfontfreetype.cpp
#	indra/llrender/llfontfreetype.h
#	indra/llwindow/CMakeLists.txt
#	indra/llwindow/llopenglview-objc.mm
#	indra/llwindow/llwindowmacosx-objc.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/media_plugins/cef/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/viewer_manifest.py
2025-09-05 14:55:37 +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 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55: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