livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llprimitive
History
Ansariel 050d2fefab Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/gltf/primitive.cpp
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llfloaterregioninfo.h
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltinygltfhelper.cpp
#	indra/newview/llvlcomposition.cpp
#	indra/newview/llvlcomposition.h
#	indra/newview/llvovolume.cpp
 		2024-06-13 03:21:12 +02:00
..
tests Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600 2024-06-13 01:54:18 +02:00
CMakeLists.txt Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-05-23 01:48:45 +02:00
legacy_object_types.h
…
lldaeloader.cpp Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-10 21:53:31 +02:00
lldaeloader.h
…
llgltfloader.cpp Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings 2024-06-01 15:49:26 +02:00
llgltfloader.h
…
llgltfmaterial.cpp Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600 2024-06-13 01:54:18 +02:00
llgltfmaterial.h Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600 2024-06-13 01:54:18 +02:00
llgltfmaterial_templates.h Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings 2024-06-01 15:49:26 +02:00
lllslconstants.h
…
llmaterial.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llmaterial.h Post-merge - trim trailing whitespace 2024-06-10 20:45:59 +03:00
llmaterialid.cpp
…
llmaterialid.h
…
llmaterialtable.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llmaterialtable.h Fix line endlings 2024-05-22 22:40:26 +03:00
llmediaentry.cpp Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings 2024-06-01 15:49:26 +02:00
llmediaentry.h
…
llmodel.cpp Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-10 21:53:31 +02:00
llmodel.h Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-09 16:11:24 +02:00
llmodelloader.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llmodelloader.h Fix line endlings 2024-05-22 22:40:26 +03:00
llprimitive.cpp Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02:00
llprimitive.h Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02:00
llprimlinkinfo.h
…
llprimtexturelist.cpp Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-09 16:11:24 +02:00
llprimtexturelist.h
…
lltextureanim.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
lltextureanim.h Fix line endlings 2024-05-22 22:40:26 +03:00
lltextureentry.cpp Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02:00
lltextureentry.h
…
lltree_common.h
…
lltreeparams.cpp
…
lltreeparams.h
…
llvolumemessage.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llvolumemessage.h
…
material_codes.cpp
…
material_codes.h
…
object_flags.h
…