phoenix-firestorm/indra/llimage
Ansariel 1dc82e5ed6 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llpointer.h
#	indra/newview/llagentcamera.cpp
#	indra/newview/llfloaterpay.cpp
#	indra/newview/llfloaterregioninfo.cpp
#	indra/newview/lllocalbitmaps.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewerobject.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llworldmapview.cpp
#	indra/newview/skins/default/xui/en/floater_world_map.xml
#	indra/newview/skins/default/xui/en/panel_region_general.xml
2026-01-06 14:32:11 +01: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 'release/2026.01' of https://github.com/secondlife/viewer 2025-12-23 14:34:51 +01:00
llimage.h Merge branch 'develop' of https://github.com/secondlife/viewer 2026-01-06 14:32:11 +01:00
llimagebmp.cpp Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-13 20:52:47 +02:00
llimagebmp.h Merge remote-tracking branch 'LGPL/master' 2024-05-16 14:10:55 +02:00
llimagedimensionsinfo.cpp Fix memory leak in LLImageDimensionsInfo (#2679) 2025-04-18 23:10:40 +03:00
llimagedimensionsinfo.h Fix memory leak in LLImageDimensionsInfo (#2679) 2025-04-18 23:10:40 +03:00
llimagedxt.cpp Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-13 20:52:47 +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 FIRE-34564 - bugsplat assertion mismatched locks in snapshot 2024-10-07 17:24:47 +01: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 Remove remnants of long-gone ndfile 2025-12-01 10:50:36 +01:00
llimagej2c.h Clean up boost includes and remove compiler warning pragma for unreachable code in PCH (#2361) 2024-08-20 18:41:48 +03:00
llimagejpeg.cpp Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llimagejpeg.h Disable LLImageJPEG setjmp hack when building on ARM to avoid crash 2025-02-11 05:04:10 -05:00
llimagepng.cpp Merge remote-tracking branch 'LGPL/master' 2024-05-16 14:10:55 +02: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 'develop' of https://github.com/secondlife/viewer 2025-10-21 00:24:37 +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 branch 'develop' of https://github.com/secondlife/viewer 2025-11-28 20:17:31 +01:00
llimageworker.h Merge remote-tracking branch 'LGPL/master' 2024-05-16 14:10:55 +02: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 Merge remote-tracking branch 'LGPL/master' 2024-05-16 14:10:55 +02:00