livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llimage
History
Ansariel c29a661b22 Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600 
# Conflicts:
#	indra/llimage/llimage.cpp
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llglslshader.cpp
#	indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
#	indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
#	indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl
#	indra/newview/gltf/accessor.cpp
#	indra/newview/gltf/accessor.h
#	indra/newview/gltf/animation.h
#	indra/newview/gltf/asset.cpp
#	indra/newview/gltf/primitive.cpp
#	indra/newview/gltf/primitive.h
#	indra/newview/gltfscenemanager.h
#	indra/newview/llenvironment.cpp
#	indra/newview/llfetchedgltfmaterial.cpp
#	indra/newview/llfloaterregioninfo.h
#	indra/newview/llimprocessing.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltinygltfhelper.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llvlcomposition.cpp
#	indra/newview/llvlcomposition.h
#	indra/newview/llvovolume.cpp
#	indra/newview/pipeline.cpp
 		2024-06-13 01:54:18 +02:00
..
tests Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-05-22 20:27:05 +02:00
CMakeLists.txt Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically 2022-05-01 00:38:40 +02:00
llimage.cpp Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600 2024-06-13 01:54:18 +02:00
llimage.h Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02:00
llimagebmp.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llimagebmp.h Fix line endlings 2024-05-22 22:40:26 +03:00
llimagedimensionsinfo.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llimagedimensionsinfo.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llimagedxt.cpp Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 19:04:21 +02:00
llimagedxt.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llimagefilter.cpp Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-10 21:53:31 +02:00
llimagefilter.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llimagej2c.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llimagej2c.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llimagejpeg.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llimagejpeg.h Fix line endlings 2024-05-22 22:40:26 +03:00
llimagepng.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llimagepng.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llimagetga.cpp Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-10 21:53:31 +02:00
llimagetga.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llimageworker.cpp Merge remote-tracking branch 'LL/DRTVWR-600-maint-A' 2024-05-22 23:53:27 +02:00
llimageworker.h Fix line endlings 2024-05-22 22:40:26 +03:00
llmapimagetype.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llpngwrapper.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
llpngwrapper.h Fix line endlings 2024-05-22 22:40:26 +03:00